1*4882a593SmuzhiyunFrom 302c12ff5714bc455949117c1c9548ccb324d55b Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Darren Kenny <darren.kenny@oracle.com> 3*4882a593SmuzhiyunDate: Tue, 8 Dec 2020 22:17:04 +0000 4*4882a593SmuzhiyunSubject: [PATCH] zfs: Fix possible integer overflows 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunIn all cases the problem is that the value being acted upon by 7*4882a593Smuzhiyuna left-shift is a 32-bit number which is then being used in the 8*4882a593Smuzhiyuncontext of a 64-bit number. 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunTo avoid overflow we ensure that the number being shifted is 64-bit 11*4882a593Smuzhiyunbefore the shift is done. 12*4882a593Smuzhiyun 13*4882a593SmuzhiyunFixes: CID 73684, CID 73695, CID 73764 14*4882a593Smuzhiyun 15*4882a593SmuzhiyunSigned-off-by: Darren Kenny <darren.kenny@oracle.com> 16*4882a593SmuzhiyunReviewed-by: Daniel Kiper <daniel.kiper@oracle.com> 17*4882a593SmuzhiyunSigned-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com> 18*4882a593Smuzhiyun--- 19*4882a593Smuzhiyun grub-core/fs/zfs/zfs.c | 8 ++++---- 20*4882a593Smuzhiyun 1 file changed, 4 insertions(+), 4 deletions(-) 21*4882a593Smuzhiyun 22*4882a593Smuzhiyundiff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c 23*4882a593Smuzhiyunindex 9087a72..b078ccc 100644 24*4882a593Smuzhiyun--- a/grub-core/fs/zfs/zfs.c 25*4882a593Smuzhiyun+++ b/grub-core/fs/zfs/zfs.c 26*4882a593Smuzhiyun@@ -564,7 +564,7 @@ find_bestub (uberblock_phys_t * ub_array, 27*4882a593Smuzhiyun ubptr = (uberblock_phys_t *) ((grub_properly_aligned_t *) ub_array 28*4882a593Smuzhiyun + ((i << ub_shift) 29*4882a593Smuzhiyun / sizeof (grub_properly_aligned_t))); 30*4882a593Smuzhiyun- err = uberblock_verify (ubptr, offset, 1 << ub_shift); 31*4882a593Smuzhiyun+ err = uberblock_verify (ubptr, offset, (grub_size_t) 1 << ub_shift); 32*4882a593Smuzhiyun if (err) 33*4882a593Smuzhiyun { 34*4882a593Smuzhiyun grub_errno = GRUB_ERR_NONE; 35*4882a593Smuzhiyun@@ -1543,7 +1543,7 @@ read_device (grub_uint64_t offset, struct grub_zfs_device_desc *desc, 36*4882a593Smuzhiyun 37*4882a593Smuzhiyun high = grub_divmod64 ((offset >> desc->ashift) + c, 38*4882a593Smuzhiyun desc->n_children, &devn); 39*4882a593Smuzhiyun- csize = bsize << desc->ashift; 40*4882a593Smuzhiyun+ csize = (grub_size_t) bsize << desc->ashift; 41*4882a593Smuzhiyun if (csize > len) 42*4882a593Smuzhiyun csize = len; 43*4882a593Smuzhiyun 44*4882a593Smuzhiyun@@ -1635,8 +1635,8 @@ read_device (grub_uint64_t offset, struct grub_zfs_device_desc *desc, 45*4882a593Smuzhiyun 46*4882a593Smuzhiyun while (len > 0) 47*4882a593Smuzhiyun { 48*4882a593Smuzhiyun- grub_size_t csize; 49*4882a593Smuzhiyun- csize = ((s / (desc->n_children - desc->nparity)) 50*4882a593Smuzhiyun+ grub_size_t csize = s; 51*4882a593Smuzhiyun+ csize = ((csize / (desc->n_children - desc->nparity)) 52*4882a593Smuzhiyun << desc->ashift); 53*4882a593Smuzhiyun if (csize > len) 54*4882a593Smuzhiyun csize = len; 55*4882a593Smuzhiyun-- 56*4882a593Smuzhiyun2.14.2 57*4882a593Smuzhiyun 58