Commit bf9021fa authored by Frank Li's avatar Frank Li Committed by Qi Xi
Browse files

i3c: master: Fix miss free init_dyn_addr at i3c_master_put_i3c_addrs() 

mainline inclusion
from mainline-v6.13-rc1
commit 3082990592f7c6d7510a9133afa46e31bbe26533
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBEAM5
CVE: CVE-2024-56562

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3082990592f7c6d7510a9133afa46e31bbe26533



--------------------------------

if (dev->boardinfo && dev->boardinfo->init_dyn_addr)
                                      ^^^ here check "init_dyn_addr"
	i3c_bus_set_addr_slot_status(&master->bus, dev->info.dyn_addr, ...)
						             ^^^^
							free "dyn_addr"
Fix copy/paste error "dyn_addr" by replacing it with "init_dyn_addr".

Cc: stable@kernel.org
Fixes: 3a379bbc ("i3c: Add core I3C infrastructure")
Reviewed-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: default avatarFrank Li <Frank.Li@nxp.com>
Link: https://lore.kernel.org/r/20241001162608.224039-1-Frank.Li@nxp.com


Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: default avatarQi Xi <xiqi2@huawei.com>
parent 8e6e5619

drivers/i3c/master.c

+1 −1
Original line number Diff line number Diff line
@@ -1285,7 +1285,7 @@ static void i3c_master_put_i3c_addrs(struct i3c_dev_desc *dev) 
					     I3C_ADDR_SLOT_FREE);



	if (dev->boardinfo && dev->boardinfo->init_dyn_addr)

		i3c_bus_set_addr_slot_status(&master->bus, dev->info.dyn_addr,

		i3c_bus_set_addr_slot_status(&master->bus, dev->boardinfo->init_dyn_addr,

					     I3C_ADDR_SLOT_FREE);

}