Commit 2227ab42 authored by Dan Carpenter's avatar Dan Carpenter Committed by Vinod Koul

dmaengine: idxd: Fix error handling in idxd_wq_cdev_dev_setup()

We can't call kfree(dev) after calling device_register(dev).  The "dev"
pointer has to be freed using put_device().

Fixes: 42d279f9 ("dmaengine: idxd: add char driver to expose submission portal to userland")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarDave Jiang <dave.jiang@intel.com>
Link: https://lore.kernel.org/r/20200205123248.hmtog7qa2eiqaagh@kili.mountainSigned-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 83c49f73
...@@ -204,6 +204,7 @@ static int idxd_wq_cdev_dev_setup(struct idxd_wq *wq) ...@@ -204,6 +204,7 @@ static int idxd_wq_cdev_dev_setup(struct idxd_wq *wq)
minor = ida_simple_get(&cdev_ctx->minor_ida, 0, MINORMASK, GFP_KERNEL); minor = ida_simple_get(&cdev_ctx->minor_ida, 0, MINORMASK, GFP_KERNEL);
if (minor < 0) { if (minor < 0) {
rc = minor; rc = minor;
kfree(dev);
goto ida_err; goto ida_err;
} }
...@@ -212,7 +213,6 @@ static int idxd_wq_cdev_dev_setup(struct idxd_wq *wq) ...@@ -212,7 +213,6 @@ static int idxd_wq_cdev_dev_setup(struct idxd_wq *wq)
rc = device_register(dev); rc = device_register(dev);
if (rc < 0) { if (rc < 0) {
dev_err(&idxd->pdev->dev, "device register failed\n"); dev_err(&idxd->pdev->dev, "device register failed\n");
put_device(dev);
goto dev_reg_err; goto dev_reg_err;
} }
idxd_cdev->minor = minor; idxd_cdev->minor = minor;
...@@ -221,8 +221,8 @@ static int idxd_wq_cdev_dev_setup(struct idxd_wq *wq) ...@@ -221,8 +221,8 @@ static int idxd_wq_cdev_dev_setup(struct idxd_wq *wq)
dev_reg_err: dev_reg_err:
ida_simple_remove(&cdev_ctx->minor_ida, MINOR(dev->devt)); ida_simple_remove(&cdev_ctx->minor_ida, MINOR(dev->devt));
put_device(dev);
ida_err: ida_err:
kfree(dev);
idxd_cdev->dev = NULL; idxd_cdev->dev = NULL;
return rc; return rc;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment