diff options
author | Christoph Hellwig <hch@lst.de> | 2019-07-11 23:55:23 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-12 14:05:43 -0400 |
commit | 265de8ce3d5b3c70644a1a45457580bb07548b56 (patch) | |
tree | e4a87b3459e5832ad8ffbcba13b3e3a614fb0cca /fs/jffs2/file.c | |
parent | 6c45b454191b330c8bc21d1ed3cf39bb6da1a4eb (diff) |
jffs2: pass the correct prototype to read_cache_page
Fix the callback jffs2 passes to read_cache_page to actually have the
proper type expected. Casting around function pointers can easily hide
typing bugs, and defeats control flow protection.
Link: http://lkml.kernel.org/r/20190520055731.24538-4-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>
Diffstat (limited to 'fs/jffs2/file.c')
-rw-r--r-- | fs/jffs2/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c index 7d8654a1472e..f8fb89b10227 100644 --- a/fs/jffs2/file.c +++ b/fs/jffs2/file.c | |||
@@ -109,9 +109,9 @@ static int jffs2_do_readpage_nolock (struct inode *inode, struct page *pg) | |||
109 | return ret; | 109 | return ret; |
110 | } | 110 | } |
111 | 111 | ||
112 | int jffs2_do_readpage_unlock(struct inode *inode, struct page *pg) | 112 | int jffs2_do_readpage_unlock(void *data, struct page *pg) |
113 | { | 113 | { |
114 | int ret = jffs2_do_readpage_nolock(inode, pg); | 114 | int ret = jffs2_do_readpage_nolock(data, pg); |
115 | unlock_page(pg); | 115 | unlock_page(pg); |
116 | return ret; | 116 | return ret; |
117 | } | 117 | } |