diff options
| author |   Gao Xiang <gaoxiang25@huawei.com> | 2018-08-24 10:02:40 +0800 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-08-27 19:46:39 +0200 |
| commit | 1257bf8052bd70dbb4ad70bc23e31f19a8db3f26 (patch) | |
| tree | 8ab1238b8b66d5e160fe1099a9ea339affe37318 /drivers/staging/erofs/unzip_vle.c | |
| parent | staging: erofs: change 'unsigned' to 'unsigned int' (diff) | |
| download | linux-dev-1257bf8052bd70dbb4ad70bc23e31f19a8db3f26.tar.xz linux-dev-1257bf8052bd70dbb4ad70bc23e31f19a8db3f26.zip | |
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>
Diffstat (limited to 'drivers/staging/erofs/unzip_vle.c')
| -rw-r--r-- | drivers/staging/erofs/unzip_vle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/erofs/unzip_vle.c b/drivers/staging/erofs/unzip_vle.c index 6c4c9280cb8c..22f9a02a75f9 100644 --- a/drivers/staging/erofs/unzip_vle.c +++ b/drivers/staging/erofs/unzip_vle.c @@ -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); |