Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

rapidio: fix possible name leaks when rio_add_device() fails

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: e8de370188d0 ("rapidio: add mport char device driver")
Fixes: 1fa5ae857bb1 ("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>

authored by

Yang Yingliang and committed by
Andrew Morton
f9574cd4 811b99fd

+11 -4
+5 -2
drivers/rapidio/devices/rio_mport_cdev.c
··· 1804 1804 rio_init_dbell_res(&rdev->riores[RIO_DOORBELL_RESOURCE], 1805 1805 0, 0xffff); 1806 1806 err = rio_add_device(rdev); 1807 - if (err) 1808 - goto cleanup; 1807 + if (err) { 1808 + put_device(&rdev->dev); 1809 + return err; 1810 + } 1811 + 1809 1812 rio_dev_get(rdev); 1810 1813 1811 1814 return 0;
+6 -2
drivers/rapidio/rio-scan.c
··· 454 454 0, 0xffff); 455 455 456 456 ret = rio_add_device(rdev); 457 - if (ret) 458 - goto cleanup; 457 + if (ret) { 458 + if (rswitch) 459 + kfree(rswitch->route_table); 460 + put_device(&rdev->dev); 461 + return NULL; 462 + } 459 463 460 464 rio_dev_get(rdev); 461 465