Commit 1bbad579 authored Nov 14, 2022 by Yang Yingliang Committed by Greg Kroah-Hartman Jan 18, 2023

rapidio: rio: fix possible name leak in rio_register_mport()

[ Upstream commit e92a216d16bde65d21a3227e0fb2aa0794576525 ]

If device_register() returns error, the name allocated by dev_set_name()
need be freed.  It should use put_device() to give up the reference in the
error path, so that the name can be freed in kobject_cleanup(), and
list_del() is called to delete the port from rio_mports.

Link: https://lkml.kernel.org/r/20221114152636.2939035-3-yangyingliang@huawei.com


Fixes: 2aaf308b ("rapidio: rework device hierarchy and introduce mport class of devices")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Cc: Alexandre Bounine <alex.bou9@gmail.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 440afd7f

drivers/rapidio/rio.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -2267,11 +2267,16 @@ int rio_register_mport(struct rio_mport *port)
		atomic_set(&port->state, RIO_DEVICE_RUNNING);

		res = device_register(&port->dev);
		if (res)
		if (res) {
		dev_err(&port->dev, "RIO: mport%d registration failed ERR=%d\n",
		port->id, res);
		else
		mutex_lock(&rio_mport_list_lock);
		list_del(&port->node);
		mutex_unlock(&rio_mport_list_lock);
		put_device(&port->dev);
		} else {
		dev_dbg(&port->dev, "RIO: registered mport%d\n", port->id);
		}

		return res;
		}