[PATCH 0/2] misc: use put_device() instead of kfree()

STALE3066d

5 messages, 3 authors, 2018-03-13 · open the first message on its own page

[PATCH 0/2] misc: use put_device() instead of kfree()

From: Arvind Yadav <hidden>
Date: 2018-03-12 11:36:51

Never directly free @dev after calling device_register(), even
if it returned an error! Always use put_device() to give up the
reference initialized.

Arvind Yadav (2):
  [PATCH 1/2] misc: mic: Release reference count and memory for VOP device
  [PATCH 2/2] misc: ocxl: use put_device() instead of device_unregister()

 drivers/misc/mic/bus/vop_bus.c | 6 ++++--
 drivers/misc/ocxl/pci.c        | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

-- 
1.9.1

[PATCH 1/2] misc: mic: Release reference count and memory for VOP device

From: Arvind Yadav <hidden>
Date: 2018-03-12 11:36:52

Never directly free @dev after calling device_register(),
even if it returned an error! Always use put_device() to
give up the reference initialized.
Release allocated memory for vop device in vop_release_dev().

Signed-off-by: Arvind Yadav <redacted>
---
 drivers/misc/mic/bus/vop_bus.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/misc/mic/bus/vop_bus.c b/drivers/misc/mic/bus/vop_bus.c
index fd7f2a6..e5bb9c7 100644
--- a/drivers/misc/mic/bus/vop_bus.c
+++ b/drivers/misc/mic/bus/vop_bus.c
@@ -135,7 +135,9 @@ void vop_unregister_driver(struct vop_driver *driver)
 
 static void vop_release_dev(struct device *d)
 {
-	put_device(d);
+	struct vop_device *dev = dev_to_vop(d);
+
+	kfree(dev);
 }
 
 struct vop_device *
@@ -174,7 +176,7 @@ struct vop_device *
 		goto free_vdev;
 	return vdev;
 free_vdev:
-	kfree(vdev);
+	put_device(&vdev->dev);
 	return ERR_PTR(ret);
 }
 EXPORT_SYMBOL_GPL(vop_register_device);
-- 
1.9.1

[PATCH 2/2] misc: ocxl: use put_device() instead of device_unregister()

From: Arvind Yadav <hidden>
Date: 2018-03-12 11:36:53

if device_register() returned an error! Always use put_device()
to give up the reference initialized.

Signed-off-by: Arvind Yadav <redacted>
---
 drivers/misc/ocxl/pci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/misc/ocxl/pci.c b/drivers/misc/ocxl/pci.c
index 0051d9e..21f4254 100644
--- a/drivers/misc/ocxl/pci.c
+++ b/drivers/misc/ocxl/pci.c
@@ -519,7 +519,7 @@ static struct ocxl_fn *init_function(struct pci_dev *dev)
 	rc = device_register(&fn->dev);
 	if (rc) {
 		deconfigure_function(fn);
-		device_unregister(&fn->dev);
+		put_device(&fn->dev);
 		return ERR_PTR(rc);
 	}
 	return fn;
-- 
1.9.1

Re: [PATCH 2/2] misc: ocxl: use put_device() instead of device_unregister()

From: Andrew Donnellan <hidden>
Date: 2018-03-13 00:26:25

On 12/03/18 22:36, Arvind Yadav wrote:
if device_register() returned an error! Always use put_device()
to give up the reference initialized.

Signed-off-by: Arvind Yadav <redacted>
This looks right, thanks for picking it up.

Acked-by: Andrew Donnellan <redacted>

-- 
Andrew Donnellan              OzLabs, ADL Canberra
andrew.donnellan@au1.ibm.com  IBM Australia Limited

Re: [PATCH 2/2] misc: ocxl: use put_device() instead of device_unregister()

From: Frederic Barrat <hidden>
Date: 2018-03-13 09:38:27


Le 12/03/2018 à 12:36, Arvind Yadav a écrit :
if device_register() returned an error! Always use put_device()
to give up the reference initialized.

Signed-off-by: Arvind Yadav <redacted>
---
OK, device_unregister() calls put_device() but also other actions that 
we can skip in this case.

Acked-by: Frederic Barrat <redacted>

quoted hunk
  drivers/misc/ocxl/pci.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/misc/ocxl/pci.c b/drivers/misc/ocxl/pci.c
index 0051d9e..21f4254 100644
--- a/drivers/misc/ocxl/pci.c
+++ b/drivers/misc/ocxl/pci.c
@@ -519,7 +519,7 @@ static struct ocxl_fn *init_function(struct pci_dev *dev)
  	rc = device_register(&fn->dev);
  	if (rc) {
  		deconfigure_function(fn);
-		device_unregister(&fn->dev);
+		put_device(&fn->dev);
  		return ERR_PTR(rc);
  	}
  	return fn;
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help