This is a note to let you know that I've just added the patch titled
i3c: fix incorrect address slot lookup on 64-bit
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
i3c-fix-incorrect-address-slot-lookup-on-64-bit.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit b9f2c5db335935ab90ffa3c1e19a0d4727ea8809
Author: Jamie Iles <quic_jiles@xxxxxxxxxxx>
Date: Wed Sep 22 17:56:00 2021 +0100
i3c: fix incorrect address slot lookup on 64-bit
[ Upstream commit f18f98110f2b179792cb70d85cba697320a3790f ]
The address slot bitmap is an array of unsigned long's which are the
same size as an int on 32-bit platforms but not 64-bit. Loading the
bitmap into an int could result in the incorrect status being returned
for a slot and slots being reported as the wrong status.
Fixes: 3a379bbcea0a ("i3c: Add core I3C infrastructure")
Cc: Boris Brezillon <bbrezillon@xxxxxxxxxx>
Cc: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxx>
Signed-off-by: Jamie Iles <quic_jiles@xxxxxxxxxxx>
Signed-off-by: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxx>
Link: https://lore.kernel.org/r/20210922165600.179394-1-quic_jiles@xxxxxxxxxxx
Stable-dep-of: 851bd21cdb55 ("i3c: master: Fix dynamic address leak when 'assigned-address' is present")
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c
index 2527965a6f24d..63c79b3cd7d4f 100644
--- a/drivers/i3c/master.c
+++ b/drivers/i3c/master.c
@@ -347,7 +347,8 @@ struct bus_type i3c_bus_type = {
static enum i3c_addr_slot_status
i3c_bus_get_addr_slot_status(struct i3c_bus *bus, u16 addr)
{
- int status, bitpos = addr * 2;
+ unsigned long status;
+ int bitpos = addr * 2;
if (addr > I2C_MAX_ADDR)
return I3C_ADDR_SLOT_RSVD;
