s390/vfio_ap: fix memory leak in vfio_ap device driver
Subsystems (4)
Tony Krowiak
maintainerPATCH 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.
--- drivers/s390/crypto/vfio_ap_drv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/s390/crypto/vfio_ap_drv.c +3 -2
@@ -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 =container_of (dev, + struct ap_matrix_dev, + device);kfree (matrix_dev); }
Signature · 1 line
2.31.1
Quoted 23 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 thevfio_matrix_devobject 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 thevfio_matrix_devobject is never freed.Since the device being released is contained within the
vfio_matrix_devobject, thecontainer_ofmacro will be used to retrieve its pointer.Fixes 1fde573413b5 ("s390: vfio-ap: base implementation of VFIO APdevice driver")
Signed-off-by Tony Krowiak <[email protected]>--- drivers/s390/crypto/vfio_ap_drv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/s390/crypto/vfio_ap_drv.c +0
-0
drivers/s390/crypto/vfio_ap_drv.c static struct ap_driver vfio_ap_drv = { · line 61
Quoted 10 lines
drivers/s390/crypto/vfio_ap_drv.c +3
-2@@ -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 =container_of (dev, + struct ap_matrix_dev, + device);kfree (matrix_dev); }
I needed some indirections to follow what exactly happens here and how you fix it, but finally I got it.
Anthony Krowiak
maintainersnip ...
Quoted 3 lines
I needed some indirections to follow what exactly happens here and how you fix it, but finally I got it.
Reviewed-by Harald Freudenberger <[email protected]>
Sorry about the indirections. Thanks for the review.
Heiko Carstens
maintainerQuoted 21 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 thevfio_matrix_devobject 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 thevfio_matrix_devobject is never freed.Since the device being released is contained within the
vfio_matrix_devobject, thecontainer_ofmacro will be used to retrieve its pointer.Fixes 1fde573413b5 ("s390: vfio-ap: base implementation of VFIO AP device driver")Signed-off-by Tony Krowiak <[email protected]>--- drivers/s390/crypto/vfio_ap_drv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/s390/crypto/vfio_ap_drv.c +0
-0
drivers/s390/crypto/vfio_ap_drv.c static struct ap_driver vfio_ap_drv = { · line 60
Quoted 9 lines
drivers/s390/crypto/vfio_ap_drv.c +3
-2@@ -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 =container_of (dev, + struct ap_matrix_dev, + device);kfree (matrix_dev);
Could you keep this code more readable, including adding the missing blank line after the declaration, please? Something like:
static void vfio_ap_matrix_dev_release(struct device *dev)
{
struct ap_matrix_dev *matrix_dev;
matrix_dev = container_of(dev, struct ap_matrix_dev, device);
kfree(matrix_dev);
}Thanks!
Anthony Krowiak
maintainerQuoted 35 lines · Heiko Carstens
Quoted 21 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 thevfio_matrix_devobject 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 thevfio_matrix_devobject is never freed.Since the device being released is contained within the
vfio_matrix_devobject, thecontainer_ofmacro will be used to retrieve its pointer.Fixes 1fde573413b5 ("s390: vfio-ap: base implementation of VFIO AP device driver")Signed-off-by Tony Krowiak <[email protected]>--- drivers/s390/crypto/vfio_ap_drv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/s390/crypto/vfio_ap_drv.c +0
-0drivers/s390/crypto/vfio_ap_drv.c static struct ap_driver vfio_ap_drv = { · line 60
Quoted 9 lines
drivers/s390/crypto/vfio_ap_drv.c +3
-2@@ -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 =container_of (dev, + struct ap_matrix_dev, + device);kfree (matrix_dev);Could you keep this code more readable, including adding the missing blank line after the declaration, please? Something like:
static void
vfio_ap_matrix_dev_release(struct device *dev)
Quoted 8 lines
{ struct ap_matrix_dev *matrix_dev; matrix_dev = container_of(dev, struct ap_matrix_dev, device); kfree(matrix_dev); }Thanks!
Will do.