aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2018-07-06 11:39:21 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-07-06 17:35:42 +0200
commitc37a192ef442fc34e9aa7c9e479f20eb4cd6f7af (patch)
treecc1051c75bb0418eb9a2655eea344b30aa2828f7
parent7cc6dfd076e84359a96a851c41ac8dc696565a3f (diff)
downloadstaging-c37a192ef442fc34e9aa7c9e479f20eb4cd6f7af.tar.gz
Staging: Gasket: shift wrapping bug in gasket_read_modify_write_64()
This function only has one caller so mask_width is 1 and mask_shift is 32. Shifting an int by 32 bits is undefined, but I guess on GCC it wraps to 0x1? Anyway it's supposed to be 0x100000000. Fixes: 9a69f5087ccc ("drivers/staging: Gasket driver framework + Apex driver") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/gasket/gasket_core.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/gasket/gasket_core.h b/drivers/staging/gasket/gasket_core.h
index 203b9a31377bf..5d6535a0f2542 100644
--- a/drivers/staging/gasket/gasket_core.h
+++ b/drivers/staging/gasket/gasket_core.h
@@ -683,7 +683,7 @@ static inline void gasket_read_modify_write_64(
u64 mask, tmp;
tmp = gasket_dev_read_64(dev, bar, location);
- mask = ((1 << mask_width) - 1) << mask_shift;
+ mask = ((1ULL << mask_width) - 1) << mask_shift;
tmp = (tmp & ~mask) | (value << mask_shift);
gasket_dev_write_64(dev, tmp, bar, location);
}