Commit 1257bf80 authored Aug 24, 2018 by Gao Xiang Committed by Greg Kroah-Hartman Aug 27, 2018

staging: erofs: fix potential overflow in z_erofs_vle_normalaccess_readpage{,s}

As Dan reported in the LKP mailing list:
https://lists.01.org/pipermail/kbuild-all/2018-August/051558.html



New smatch warnings:
drivers/staging/erofs/unzip_vle.c:1359 z_erofs_vle_normalaccess_readpages() warn: should '()->index << 12' be a 64 bit type?

Old smatch warnings:
drivers/staging/erofs/unzip_vle.c:1322 z_erofs_vle_normalaccess_readpage() warn: should 'page->index << 12' be a 64 bit type?

It needs to cast variable's type to erofs_off_t before left shifting.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 89fcd836

drivers/staging/erofs/unzip_vle.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1314,7 +1314,7 @@ static int z_erofs_vle_normalaccess_readpage(struct file *file,
		LIST_HEAD(pagepool);

		#if (EROFS_FS_ZIP_CACHE_LVL >= 2)
		f.cachedzone_la = page->index << PAGE_SHIFT;
		f.cachedzone_la = (erofs_off_t)page->index << PAGE_SHIFT;
		#endif
		err = z_erofs_do_read_page(&f, page, &pagepool);
		(void)z_erofs_vle_work_iter_end(&f.builder);
		@@ -1347,7 +1347,7 @@ static inline int __z_erofs_vle_normalaccess_readpages(
		LIST_HEAD(pagepool);

		#if (EROFS_FS_ZIP_CACHE_LVL >= 2)
		f.cachedzone_la = lru_to_page(pages)->index << PAGE_SHIFT;
		f.cachedzone_la = (erofs_off_t)lru_to_page(pages)->index << PAGE_SHIFT;
		#endif
		for (; nr_pages; --nr_pages) {
		struct page *page = lru_to_page(pages);

Admin message