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

Commit e2db58f7 authored by Jiasheng Jiang's avatar Jiasheng Jiang Committed by Greg Kroah-Hartman
Browse files

fsi: core: Check error number after calling ida_simple_get 



[ Upstream commit 35af9fb49bc5c6d61ef70b501c3a56fe161cce3e ]

If allocation fails, the ida_simple_get() will return error number.
So master->idx could be error number and be used in dev_set_name().
Therefore, it should be better to check it and return error if fails,
like the ida_simple_get() in __fsi_get_new_minor().

Fixes: 09aecfab ("drivers/fsi: Add fsi master definition")
Signed-off-by: default avatarJiasheng Jiang <jiasheng@iscas.ac.cn>
Reviewed-by: default avatarEddie James <eajames@linux.ibm.com>
Link: https://lore.kernel.org/r/20220111073411.614138-1-jiasheng@iscas.ac.cn


Signed-off-by: default avatarJoel Stanley <joel@jms.id.au>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 1007f1d1

drivers/fsi/fsi-core.c

+3 −0
Original line number Diff line number Diff line
@@ -1279,6 +1279,9 @@ int fsi_master_register(struct fsi_master *master) 


	mutex_init(&master->scan_lock);

	master->idx = ida_simple_get(&master_ida, 0, INT_MAX, GFP_KERNEL);

	if (master->idx < 0)

		return master->idx;



	dev_set_name(&master->dev, "fsi%d", master->idx);



	rc = device_register(&master->dev);