MIRRORS/linux-yocto
1
0
Fork 0
mirror of git://git.yoctoproject.org/linux-yocto.git synced 2025-07-05 13:25:20 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

i3c: Fix a shift wrap bug in i3c_bus_set_addr_slot_status()

Browse Source 
commit 476c7e1d34 upstream.

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: 3a379bbcea ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dan Carpenter 2019-04-23 13:40:20 +03:00 committed by Greg Kroah-Hartman
parent 4b1f2ad28f
commit be4b9a303a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/i3c/master.c
View File

@ -385,8 +385,9 @@ static void i3c_bus_set_addr_slot_status(struct i3c_bus *bus, u16 addr,
return; return;
ptr = bus->addrslots + (bitpos / BITS_PER_LONG); ptr = bus->addrslots + (bitpos / BITS_PER_LONG);
*ptr &= ~(I3C_ADDR_SLOT_STATUS_MASK << (bitpos % BITS_PER_LONG)); *ptr &= ~((unsigned long)I3C_ADDR_SLOT_STATUS_MASK <<
*ptr |= status << (bitpos % BITS_PER_LONG); (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) static bool i3c_bus_dev_addr_is_avail(struct i3c_bus *bus, u8 addr)