The patch titled Subject: mm/filemap.c: fix an overly long line in read_cache_page has been added to the -mm tree. Its filename is mm-fix-an-overly-long-line-in-read_cache_page.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-fix-an-overly-long-line-in-read_cache_page.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-fix-an-overly-long-line-in-read_cache_page.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Christoph Hellwig <hch@xxxxxx> Subject: 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@xxxxxx Signed-off-by: Christoph Hellwig <hch@xxxxxx> Reviewed-by: Kees Cook <keescook@xxxxxxxxxxxx> Cc: Nick Desaulniers <ndesaulniers@xxxxxxxxxx> Cc: Sami Tolvanen <samitolvanen@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/filemap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/mm/filemap.c~mm-fix-an-overly-long-line-in-read_cache_page +++ a/mm/filemap.c @@ -2862,7 +2862,8 @@ struct page *read_cache_page(struct addr 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); _ Patches currently in -mm which might be from hch@xxxxxx are mm-fix-an-overly-long-line-in-read_cache_page.patch mm-dont-cast-readpage-to-filler_t-for-do_read_cache_page.patch jffs2-pass-the-correct-prototype-to-read_cache_page.patch 9p-pass-the-correct-prototype-to-read_cache_page.patch byteorder-sanity-check-toolchain-vs-kernel-endianess.patch