Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dd8055f authored by Sami Tolvanen's avatar Sami Tolvanen Committed by Alistair Strachan
Browse files

FROMLIST: 9p: pass the correct prototype to read_cache_page 



Fix 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.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Change-Id: I3738b7c0c7f77f85cd7007141400c36516dac6b8
Link: https://lkml.org/lkml/2019/5/1/374


Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
parent 1721095e

fs/9p/vfs_addr.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -50,8 +50,9 @@ 
 * @page: structure to page

 * @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 inode *inode = page->mapping->host;

	struct bio_vec bvec = {.bv_page = page, .bv_len = PAGE_SIZE};

	struct bio_vec bvec = {.bv_page = page, .bv_len = PAGE_SIZE};

	struct iov_iter to;

	struct iov_iter to;
@@ -122,7 +123,8 @@ static int v9fs_vfs_readpages(struct file *filp, struct address_space *mapping, 
	if (ret == 0)

	if (ret == 0)

		return ret;

		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);

	p9_debug(P9_DEBUG_VFS, "  = %d\n", ret);

	return ret;

	return ret;

}

}