Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9752c37c authored by Vitor Soares's avatar Vitor Soares Committed by Boris Brezillon
Browse files

i3c: Fix the verification of random PID 



The validation of random PID should be done by checking the
boardinfo->pid instead of info.pid which is empty.

Doing the change the info struture declaration is no longer necessary.

Cc: Boris Brezillon <bbrezillon@kernel.org>
Cc: <stable@vger.kernel.org>
Fixes: 3a379bbc ("i3c: Add core I3C infrastructure")
Signed-off-by: default avatarVitor Soares <vitor.soares@synopsys.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
parent 15ade5d2

drivers/i3c/master.c

+2 −3
Original line number Diff line number Diff line
@@ -1980,7 +1980,6 @@ of_i3c_master_add_i3c_boardinfo(struct i3c_master_controller *master, 
{

	struct i3c_dev_boardinfo *boardinfo;

	struct device *dev = &master->dev;

	struct i3c_device_info info = { };

	enum i3c_addr_slot_status addrstatus;

	u32 init_dyn_addr = 0;
@@ -2012,8 +2011,8 @@ of_i3c_master_add_i3c_boardinfo(struct i3c_master_controller *master, 


	boardinfo->pid = ((u64)reg[1] << 32) | reg[2];



	if ((info.pid & GENMASK_ULL(63, 48)) ||

	    I3C_PID_RND_LOWER_32BITS(info.pid))

	if ((boardinfo->pid & GENMASK_ULL(63, 48)) ||

	    I3C_PID_RND_LOWER_32BITS(boardinfo->pid))

		return -EINVAL;



	boardinfo->init_dyn_addr = init_dyn_addr;