s390/vfio-ap: Fix module unload memory leak of matrix_dev
Subsystems (3)
Jason J. Herne
maintainerPATCH 1/1 s390/vfio-ap: Fix module unload memory leak of matrix_dev
vfio_ap_matrix_dev_release is shadowing the global matrix_dev with driver data that never gets set. So when release is called we end up not freeing matrix_dev. The fix is to remove the shadow variable and just free the global.
--- drivers/s390/crypto/vfio_ap_drv.c | 2 -- 1 file changed, 2 deletions(-)
drivers/s390/crypto/vfio_ap_drv.c +0 -2
@@ -82,8 +82,6 @@ static void vfio_ap_queue_dev_remove(struct ap_device *apdev)static void vfio_ap_matrix_dev_release (struct device *dev) { -struct ap_matrix_dev *matrix_dev =dev_get_drvdata (dev); -kfree (matrix_dev); }
Signature · 1 line
2.21.1
Quoted 4 lines · Jason J. Herne
vfio_ap_matrix_dev_releaseis shadowing the globalmatrix_devwith driver data that never gets set. So when release is called we end up not freeingmatrix_dev. The fix is to remove the shadow variable and just free the global.
I would clarify this commit message to say that the drv_data of the matrix_dev is never set and so dev_get_drvdata() always returns NULL
And I would suggest to use
container_of(dev, struct ap_matrix_dev, dev)
instead of the global variable, and probably NULL the global too..
Jason
Jason J. Herne
maintainerQuoted 9 lines · Jason Gunthorpe
Quoted 4 lines · Jason J. Herne
vfio_ap_matrix_dev_releaseis shadowing the globalmatrix_devwith driver data that never gets set. So when release is called we end up not freeingmatrix_dev. The fix is to remove the shadow variable and just free the global.I would clarify this commit message to say that the
drv_dataof thematrix_devis never set and sodev_get_drvdata()always returns NULL
Quoted 7 lines
And I would suggest to use
container_of(dev, struct ap_matrix_dev, dev)instead of the global variable, and probably NULL the global too..
The use of driver_data seems to have been completely erroneous here. In this case the global matrix_dev is the top level struct. It is not contained in anything. matrix_dev is created upon module load, and it is freed when the module exits.
So I don't think using container_of makes sense. Unless I've misunderstood your suggestion?
Signature · 1 line
-- Jason J. Herne ([email protected])
Quoted 18 lines · Jason J. Herne
Quoted 9 lines · Jason Gunthorpe
Quoted 4 lines · Jason J. Herne
vfio_ap_matrix_dev_releaseis shadowing the globalmatrix_devwith driver data that never gets set. So when release is called we end up not freeingmatrix_dev. The fix is to remove the shadow variable and just free the global.I would clarify this commit message to say that the
drv_dataof thematrix_devis never set and sodev_get_drvdata()always returns NULLQuoted 7 lines
And I would suggest to use
container_of(dev, struct ap_matrix_dev, dev)instead of the global variable, and probably NULL the global too..
Quoted 7 lines
The use of
driver_dataseems to have been completely erroneous here. In this case the globalmatrix_devis the top level struct. It is not contained in anything.matrix_devis created upon module load, and it is freed when the module exits.So I don't think using
container_ofmakes sense. Unless I've misunderstood your suggestion?
matrix_dev = kzalloc(sizeof(*matrix_dev), GFP_KERNEL); matrix_dev->device.release = vfio_ap_matrix_dev_release; ret = device_register(&matrix_dev->device);
"dev" is contained inside matrix_dev which is why we should use container of to go from a struct device pointer back to the containing matrix_dev pointer
Jason
Quoted 23 lines · Jason J. Herne
vfio_ap_matrix_dev_releaseis shadowing the globalmatrix_devwith driver data that never gets set. So when release is called we end up not freeingmatrix_dev. The fix is to remove the shadow variable and just free the global.Signed-off-by Jason J. Herne <[email protected]>--- drivers/s390/crypto/vfio_ap_drv.c | 2 -- 1 file changed, 2 deletions(-)drivers/s390/crypto/vfio_ap_drv.c +0
-2@@ -82,8 +82,6 @@ static void vfio_ap_queue_dev_remove(struct ap_device *apdev)static void vfio_ap_matrix_dev_release (struct device *dev) { -struct ap_matrix_dev *matrix_dev =dev_get_drvdata (dev); -kfree (matrix_dev); }