aboutsummaryrefslogtreecommitdiff
path: root/drivers/i3c
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2019-04-23 13:40:20 +0300
committerBoris Brezillon <boris.brezillon@collabora.com>2019-05-06 08:15:02 +0200
commit476c7e1d34f2a03b1aa5a924c50703053fe5f77c (patch)
tree4b78b80c72c9e9a18e0bd34f352696b330af5f11 /drivers/i3c
parent124dbd750da4a9bf494ae9d8cbed364058140731 (diff)
downloadlinux-476c7e1d34f2a03b1aa5a924c50703053fe5f77c.tar.gz
i3c: Fix a shift wrap bug in i3c_bus_set_addr_slot_status()
The problem here is that addr can be I3C_BROADCAST_ADDR (126). That means we're shifting by (126 * 2) % 64 which is 60. The I3C_ADDR_SLOT_STATUS_MASK is an enum which is an unsigned int in GCC so shifts greater than 31 are undefined. Fixes: 3a379bbcea0a ("i3c: Add core I3C infrastructure") Cc: <stable@vger.kernel.org> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Diffstat (limited to 'drivers/i3c')
-rw-r--r--drivers/i3c/master.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c
index 2dc628d4f1ae..d539252eed79 100644
--- a/drivers/i3c/master.c
+++ b/drivers/i3c/master.c
@@ -385,8 +385,9 @@ static void i3c_bus_set_addr_slot_status(struct i3c_bus *bus, u16 addr,
return;
ptr = bus->addrslots + (bitpos / BITS_PER_LONG);
- *ptr &= ~(I3C_ADDR_SLOT_STATUS_MASK << (bitpos % BITS_PER_LONG));
- *ptr |= status << (bitpos % BITS_PER_LONG);
+ *ptr &= ~((unsigned long)I3C_ADDR_SLOT_STATUS_MASK <<
+ (bitpos % BITS_PER_LONG));
+ *ptr |= (unsigned long)status << (bitpos % BITS_PER_LONG);
}
static bool i3c_bus_dev_addr_is_avail(struct i3c_bus *bus, u8 addr)