fix filler_t callback type mismatches v2
Subsystems (7)
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.
Changes since v1:
- add the 9p patch to the series
- drop the nfs patch that has been merged
PATCH 1/4 mm: fix an overly long line in read_cache_page
--- mm/filemap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
mm/filemap.c +2 -1
@@ -2862,7 +2862,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);
Signature · 1 line
2.20.1
PATCH 2/4 mm: don't cast ->readpage to filler_t for do_read_cache_page
In reply to Christoph HellwigWe can just pass a NULL filler and do the right thing inside of do_read_cache_page based on the NULL parameter.
--- include/linux/pagemap.h | 3 +-- mm/filemap.c | 10 ++++++---- 2 files changed, 7 insertions(+), 6 deletions(-)
include/linux/pagemap.h +1 -2
@@ -396,8 +396,7 @@ extern int read_cache_pages(struct address_space *mapping,static inline struct page *read_mapping_page (struct address_space *mapping,pgoff_t index,void *data) { -filler_t *filler = (filler_t *)mapping->a_ops->readpage; -return read_cache_page (mapping, index, filler, data); +return read_cache_page (mapping, index,NULL , data); }/*
mm/filemap.c +6 -4
@@ -2772,7 +2772,11 @@ static struct page *do_read_cache_page(struct address_space *mapping, } filler: - err =filler (data, page); +if (filler) + err =filler (data, page); +else + err = mapping->a_ops->readpage (data, page); +if (err <0 ) {put_page (page);return ERR_PTR (err);
@@ -2884,9 +2888,7 @@ struct page *read_cache_page_gfp(struct address_space *mapping,pgoff_t index, gfp_t gfp) { -filler_t *filler = (filler_t *)mapping->a_ops->readpage; - -return do_read_cache_page (mapping, index, filler,NULL , gfp); + return do_read_cache_page(mapping, index, NULL, NULL, gfp); }EXPORT_SYMBOL (read_cache_page_gfp);
Signature · 1 line
2.20.1
PATCH 3/4 jffs2: pass the correct prototype to read_cache_page
In reply to Christoph HellwigFix 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.
--- fs/jffs2/file.c | 4 ++-- fs/jffs2/fs.c | 2 +- fs/jffs2/os-linux.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
fs/jffs2/file.c +2 -2
@@ -109,9 +109,9 @@ static int jffs2_do_readpage_nolock (struct inode *inode, struct page *pg)return ret; } -int jffs2_do_readpage_unlock (struct inode *inode,struct page *pg) +int jffs2_do_readpage_unlock (void *data,struct page *pg) { -int ret =jffs2_do_readpage_nolock (inode, pg); +int ret =jffs2_do_readpage_nolock (data, pg);unlock_page (pg);return ret; }
fs/jffs2/fs.c +1 -1
@@ -687,7 +687,7 @@ unsigned char *jffs2_gc_fetch_page(struct jffs2_sb_info *c,struct page *pg; pg =read_cache_page (inode->i_mapping, offset >>PAGE_SHIFT , - (void *)jffs2_do_readpage_unlock, inode); + jffs2_do_readpage_unlock, inode);if (IS_ERR (pg))return (void *)pg;
fs/jffs2/os-linux.h +1 -1
@@ -155,7 +155,7 @@ extern const struct file_operations jffs2_file_operations;extern const struct inode_operations jffs2_file_inode_operations;extern const struct address_space_operations jffs2_file_address_operations;int jffs2_fsync (struct file *,loff_t ,loff_t ,int ); -int jffs2_do_readpage_unlock (struct inode *inode,struct page *pg); +int jffs2_do_readpage_unlock (void *data,struct page *pg);/* ioctl.c */ long jffs2_ioctl (struct file *,unsigned int ,unsigned long );
Signature · 1 line
2.20.1
Re: [PATCH 3/4] jffs2: pass the correct prototype to read_cache_page
Quoted 3 lines · Christoph Hellwig
Fix the callback jffs2 passes to
read_cache_pageto actually have the proper type expected. Casting around function pointers can easily hide typing bugs, and defeats control flow protection.
FWIW, this
unsigned char *jffs2_gc_fetch_page(struct jffs2_sb_info *c,
struct jffs2_inode_info *f, unsigned long offset, unsigned long *priv)
{
struct inode *inode = OFNI_EDONI_2SFFJ(f);
struct page *pg;
pg = read_cache_page(inode->i_mapping, offset >> PAGE_SHIFT,
(void *)jffs2_do_readpage_unlock, inode);
if (IS_ERR(pg))
return (void *)pg;
*priv = (unsigned long)pg;
return kmap(pg);
}looks like crap. And so does this:
void jffs2_gc_release_page(struct jffs2_sb_info *c,
unsigned char *ptr, unsigned long *priv)
{
struct page *pg = (void *)*priv;
kunmap(pg);
put_page(pg);
} First of all, there's only one caller for each of those, and both
are direct calls. So passing struct page * around that way is ridiculous. What's more, there is no reason not to do kmap() in caller (i.e. in jffs2_garbage_collect_dnode()). That way jffs2_gc_fetch_page() would simply be return read_cache_page(....), and in the caller we'd have
struct page *pg;
unsigned char *pg_ptr;
...
mutex_unlock(&f->sem);
pg = jffs2_gc_fetch_page(c, f, start);
if (IS_ERR(pg)) {
mutex_lock(&f->sem);
pr_warn("read_cache_page() returned error: %ld\n", PTR_ERR(pg));
return PTR_ERR(pg);
}
pg_ptr = kmap(pg);
mutex_lock(&f->sem);
...
kunmap(pg);
put_page(pg);and that's it, preserving the current locking and with saner types...
PATCH 4/4 9p: pass the correct prototype to read_cache_page
In reply to Christoph HellwigFix the callback 9p 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.
--- fs/9p/vfs_addr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/9p/vfs_addr.c +4 -2
@@ -50,8 +50,9 @@* @page: structure to page * */ -static int v9fs_fid_readpage (struct p9_fid *fid,struct page *page) +static int v9fs_fid_readpage (void *data,struct page *page) { +struct p9_fid *fid = data;struct inode *inode = page->mapping->host;struct bio_vec bvec = {.bv_page = page, .bv_len =PAGE_SIZE };struct iov_iter to;
@@ -122,7 +123,8 @@ static int v9fs_vfs_readpages(struct file *filp, struct address_space *mapping,if (ret ==0 )return ret; - ret =read_cache_pages (mapping, pages, (void *)v9fs_vfs_readpage, filp); + ret =read_cache_pages (mapping, pages, v9fs_fid_readpage, + filp->private_data);p9_debug (P9_DEBUG_VFS ," = %d\n" , ret);return ret; }
Signature · 1 line
2.20.1