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

rapidio: fix possible name leaks when rio_add_device() fails

[ Upstream commit f9574cd48679926e2a569e1957a5a1bcc8a719ac ]

Patch series "rapidio: fix three possible memory leaks".

This patchset fixes three name leaks in error handling.
 - patch #1 fixes two name leaks while rio_add_device() fails.
 - patch #2 fixes a name leak while  rio_register_mport() fails.

This patch (of 2):

If rio_add_device() 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 the
'rdev' can be freed in rio_release_dev().

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


Fixes: e8de3701 ("rapidio: add mport char device driver")
Fixes: 1fa5ae85 ("driver core: get rid of struct device's bus_id string array")
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 7ef51688

drivers/rapidio/devices/rio_mport_cdev.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -1807,8 +1807,11 @@ static int rio_mport_add_riodev(struct mport_cdev_priv *priv,
		rio_init_dbell_res(&rdev->riores[RIO_DOORBELL_RESOURCE],
		0, 0xffff);
		err = rio_add_device(rdev);
		if (err)
		goto cleanup;
		if (err) {
		put_device(&rdev->dev);
		return err;
		}

		rio_dev_get(rdev);

		return 0;

drivers/rapidio/rio-scan.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -456,8 +456,12 @@ static struct rio_dev rio_setup_device(struct rio_net net,
		0, 0xffff);

		ret = rio_add_device(rdev);
		if (ret)
		goto cleanup;
		if (ret) {
		if (rswitch)
		kfree(rswitch->route_table);
		put_device(&rdev->dev);
		return NULL;
		}

		rio_dev_get(rdev);