Skip to contentSkip to conversation

s390/vfio_ap: fix memory leak in vfio_ap device driver

PATCH Applied Tony Krowiak 2 participants 3 messages Mar 20, 2023 – Mar 21, 2023

Subsystems (3)
lore
Share & tools
lore

Tony Krowiak

author maintainer
#0 lore raw

PATCH v2 1/1 s390/vfio_ap: fix memory leak in vfio_ap device driver

The device release callback function invoked to release the matrix device uses the dev_get_drvdata(device *dev) function to retrieve the pointer to the vfio_matrix_dev object in order to free its storage. The problem is, this object is not stored as drvdata with the device; since the kfree function will accept a NULL pointer, the memory for the vfio_matrix_dev object is never freed.

Since the device being released is contained within the vfio_matrix_dev object, the container_of macro will be used to retrieve its pointer.

Fixes 1fde573413b5 ("s390: vfio-ap: base implementation of VFIO AP device driver")
---
 drivers/s390/crypto/vfio_ap_drv.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/s390/crypto/vfio_ap_drv.c +2 -1
index 997b524bdd2b..a48c6938ae68 100644
@@ -54,8 +54,9 @@ static struct ap_driver vfio_ap_drv = {
 
 static void vfio_ap_matrix_dev_release(struct device *dev)
 {
-	struct ap_matrix_dev *matrix_dev = dev_get_drvdata(dev);
+	struct ap_matrix_dev *matrix_dev;
 
+	matrix_dev = container_of(dev, struct ap_matrix_dev, device);
 	kfree(matrix_dev);
 }
 
Signature · 1 line
2.31.1
author maintainer
#1 lore raw

PING!

Quoted 32 lines · Tony Krowiak

The device release callback function invoked to release the matrix device uses the dev_get_drvdata(device *dev) function to retrieve the pointer to the vfio_matrix_dev object in order to free its storage. The problem is, this object is not stored as drvdata with the device; since the kfree function will accept a NULL pointer, the memory for the vfio_matrix_dev object is never freed.

Since the device being released is contained within the vfio_matrix_dev object, the container_of macro will be used to retrieve its pointer.

Fixes 1fde573413b5 ("s390: vfio-ap: base implementation of VFIO AP device driver")
---
  drivers/s390/crypto/vfio_ap_drv.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
drivers/s390/crypto/vfio_ap_drv.c +2 -1
index 997b524bdd2b..a48c6938ae68 100644
@@ -54,8 +54,9 @@ static struct ap_driver vfio_ap_drv = {
 
  static void vfio_ap_matrix_dev_release(struct device *dev)
  {
-	struct ap_matrix_dev *matrix_dev = dev_get_drvdata(dev);
+	struct ap_matrix_dev *matrix_dev;
 
+	matrix_dev = container_of(dev, struct ap_matrix_dev, device);
  	kfree(matrix_dev);
  }
 
maintainer Applied
#2 lore raw
In reply to Tony Krowiak
Quoted 10 lines · Tony Krowiak

The device release callback function invoked to release the matrix device uses the dev_get_drvdata(device *dev) function to retrieve the pointer to the vfio_matrix_dev object in order to free its storage. The problem is, this object is not stored as drvdata with the device; since the kfree function will accept a NULL pointer, the memory for the vfio_matrix_dev object is never freed.

Since the device being released is contained within the vfio_matrix_dev object, the container_of macro will be used to retrieve its pointer.

Quoted 6 lines
Fixes 1fde573413b5 ("s390: vfio-ap: base implementation of VFIO AP device driver")
---
 drivers/s390/crypto/vfio_ap_drv.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Applied.