summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWenkai Lin <linwenkai6@hisilicon.com>2025-12-02 14:12:53 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2026-01-30 10:32:25 +0100
commitbd2393ed7712513e7e2dbcb6e21464a67ff9e702 (patch)
tree6b722ca6823acb247c8263b57d1e19f7e9212d1a
parent242cbb3df97af62c4c40db4420cba8326c298755 (diff)
downloadlinux-bd2393ed7712513e7e2dbcb6e21464a67ff9e702.tar.gz
linux-bd2393ed7712513e7e2dbcb6e21464a67ff9e702.tar.bz2
linux-bd2393ed7712513e7e2dbcb6e21464a67ff9e702.zip
uacce: fix cdev handling in the cleanup path
commit a3bece3678f6c88db1f44c602b2a63e84b4040ac upstream. When cdev_device_add fails, it internally releases the cdev memory, and if cdev_device_del is then executed, it will cause a hang error. To fix it, we check the return value of cdev_device_add() and clear uacce->cdev to avoid calling cdev_device_del in the uacce_remove. Fixes: 015d239ac014 ("uacce: add uacce driver") Cc: stable@vger.kernel.org Signed-off-by: Wenkai Lin <linwenkai6@hisilicon.com> Signed-off-by: Chenghai Huang <huangchenghai2@huawei.com> Acked-by: Zhangfei Gao <zhangfei.gao@linaro.org> Link: https://patch.msgid.link/20251202061256.4158641-2-huangchenghai2@huawei.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/misc/uacce/uacce.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/misc/uacce/uacce.c b/drivers/misc/uacce/uacce.c
index 42e7d2a2a90c..43d215fb8c73 100644
--- a/drivers/misc/uacce/uacce.c
+++ b/drivers/misc/uacce/uacce.c
@@ -519,6 +519,8 @@ EXPORT_SYMBOL_GPL(uacce_alloc);
*/
int uacce_register(struct uacce_device *uacce)
{
+ int ret;
+
if (!uacce)
return -ENODEV;
@@ -529,7 +531,11 @@ int uacce_register(struct uacce_device *uacce)
uacce->cdev->ops = &uacce_fops;
uacce->cdev->owner = THIS_MODULE;
- return cdev_device_add(uacce->cdev, &uacce->dev);
+ ret = cdev_device_add(uacce->cdev, &uacce->dev);
+ if (ret)
+ uacce->cdev = NULL;
+
+ return ret;
}
EXPORT_SYMBOL_GPL(uacce_register);