]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
staging: erofs: fix potential overflow in erofs_grab_bio()
authorChao Yu <yuchao0@huawei.com>
Tue, 21 Aug 2018 14:49:37 +0000 (22:49 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Aug 2018 17:46:13 +0000 (19:46 +0200)
As Dan reported in LKP's mailing list:

https://lists.01.org/pipermail/kbuild-all/2018-August/051419.html

New smatch warnings:
drivers/staging/erofs/internal.h:446 erofs_grab_bio() warn: should 'blkaddr << (12 - 9)' be a 64 bit type?
drivers/staging/erofs/data.c:78 __erofs_get_meta_page() error: 'bio' dereferencing possible ERR_PTR()
drivers/staging/erofs/internal.h:446 erofs_grab_bio() warn: should 'blkaddr << (12 - 9)' be a 64 bit type?

Old smatch warnings:
drivers/staging/erofs/unzip_vle.c:989 z_erofs_vle_unzip() error: double unlock 'mutex:&z_pagemap_global_lock'
drivers/staging/erofs/unzip_vle.c:1318 z_erofs_vle_normalaccess_readpage() warn: should 'page->index << 12' be a 64 bit type?
drivers/staging/erofs/unzip_vle.c:1351 __z_erofs_vle_normalaccess_readpages() warn: should '()->index << 12' be a 64 bit type?

It needs to cast varable's type to sector_t before left shifting.

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

index 8951e01216e3157c695f7d67725c72276f3d3f0d..f20c6e9b7471171a2ba71e6a02cb3491a293a014 100644 (file)
@@ -443,7 +443,7 @@ erofs_grab_bio(struct super_block *sb,
 
        bio->bi_end_io = endio;
        bio_set_dev(bio, sb->s_bdev);
-       bio->bi_iter.bi_sector = blkaddr << LOG_SECTORS_PER_BLOCK;
+       bio->bi_iter.bi_sector = (sector_t)blkaddr << LOG_SECTORS_PER_BLOCK;
        return bio;
 }