Commit d322a8e5 authored Jul 11, 2019 by Christoph Hellwig Committed by Linus Torvalds Jul 12, 2019

mm/filemap.c: fix an overly long line in read_cache_page

Patch series "fix filler_t callback type mismatches", v2.

Casting mapping->a_ops->readpage to filler_t causes an indirect call
type mismatch with Control-Flow Integrity checking.  This change fixes
the mismatch in read_cache_page_gfp and read_mapping_page by adding
using a NULL filler argument as an indication to call ->readpage
directly, and by passing the right parameter callbacks in nfs and jffs2.

This patch (of 4):

Code cleanup.

Link: http://lkml.kernel.org/r/20190520055731.24538-2-hch@lst.de


Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Kees Cook <keescook@chromium.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 3972f6bb

mm/filemap.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2915,7 +2915,8 @@ struct page read_cache_page(struct address_space mapping,
		int (filler)(void , struct page *),
		void *data)
		{
		return do_read_cache_page(mapping, index, filler, data, mapping_gfp_mask(mapping));
		return do_read_cache_page(mapping, index, filler, data,
		mapping_gfp_mask(mapping));
		}
		EXPORT_SYMBOL(read_cache_page);

Admin message