summaryrefslogtreecommitdiff
path: root/drivers/ntb/core.c
diff options
context:
space:
mode:
authorYang Yingliang <yangyingliang@huawei.com>2023-12-01 06:30:56 +0300
committerManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>2024-02-16 13:43:38 +0300
commitaebfdfe39b9327a3077d0df8db3beb3160c9bdd0 (patch)
tree9270d39143d51a7dd751665049f51de1217cbc25 /drivers/ntb/core.c
parentc795fd3f3622d276f3cdb7b64e6e6c4042585734 (diff)
downloadlinux-aebfdfe39b9327a3077d0df8db3beb3160c9bdd0.tar.xz
NTB: fix possible name leak in ntb_register_device()
If device_register() fails in ntb_register_device(), the device name allocated by dev_set_name() should be freed. As per the comment in device_register(), callers should use put_device() to give up the reference in the error path. So fix this by calling put_device() in the error path so that the name can be freed in kobject_cleanup(). As a result of this, put_device() in the error path of ntb_register_device() is removed and the actual error is returned. Fixes: a1bd3baeb2f1 ("NTB: Add NTB hardware abstraction layer") Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Reviewed-by: Dave Jiang <dave.jiang@intel.com> Link: https://lore.kernel.org/r/20231201033057.1399131-1-yangyingliang@huaweicloud.com [mani: reworded commit message] Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Diffstat (limited to 'drivers/ntb/core.c')
-rw-r--r--drivers/ntb/core.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/ntb/core.c b/drivers/ntb/core.c
index 27dd93deff6e..d702bee78082 100644
--- a/drivers/ntb/core.c
+++ b/drivers/ntb/core.c
@@ -100,6 +100,8 @@ EXPORT_SYMBOL(ntb_unregister_client);
int ntb_register_device(struct ntb_dev *ntb)
{
+ int ret;
+
if (!ntb)
return -EINVAL;
if (!ntb->pdev)
@@ -120,7 +122,11 @@ int ntb_register_device(struct ntb_dev *ntb)
ntb->ctx_ops = NULL;
spin_lock_init(&ntb->ctx_lock);
- return device_register(&ntb->dev);
+ ret = device_register(&ntb->dev);
+ if (ret)
+ put_device(&ntb->dev);
+
+ return ret;
}
EXPORT_SYMBOL(ntb_register_device);