staging: vme: fix memory leak in vme_user_probe()
PATCH 1/1 staging: vme: fix memory leak in vme_user_probe()
If vme_master_request() returns NULL when it failed, it need to free buffers for master.
And also removes unreachable code in vme_user_probe().
--- drivers/staging/vme/devices/vme_user.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-)
drivers/staging/vme/devices/vme_user.c +3 -6
@@ -776,7 +776,8 @@ static int vme_user_probe(struct vme_dev *vdev) image[i].kern_buf =kmalloc (image[i].size_buf,GFP_KERNEL );if (image[i].kern_buf ==NULL ) { err = -ENOMEM ; - goto err_master_buf; +vme_master_free (image[i].resource); + goto err_master; } }
@@ -819,8 +820,6 @@ static int vme_user_probe(struct vme_dev *vdev)return 0 ; -/* Ensure counter set correcty to destroy all sysfs devices */ - i =VME_DEVS ; err_sysfs:while (i >0 ) { i--;
@@ -830,12 +829,10 @@ err_sysfs:/* Ensure counter set correcty to unalloc all master windows */ i =MASTER_MAX +1 ; -err_master_buf: -for (i =MASTER_MINOR ; i < (MASTER_MAX +1 ); i++) -kfree (image[i].kern_buf); err_master:while (i >MASTER_MINOR ) { i--; +kfree (image[i].kern_buf);vme_master_free (image[i].resource); }
Signature · 1 line
1.7.4.4
----- Original Message -----
Quoted 8 lines
From: "Daeseok Youn" <[email protected]>
Sent: Tuesday, March 25, 2014 10:01:48 PM
Subject: [PATCH] staging: vme: fix memory leak invme_user_probe()If
vme_master_request()returns NULL when it failed, it need to free buffers for master.
Quoted 6 lines
And also removes unreachable code in
vme_user_probe().Signed-off-by Daeseok Youn <[email protected]>--- drivers/staging/vme/devices/vme_user.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-)
Nice catches Daeseok. I don't maintain this driver, but I have some suggestions below.
Quoted 7 lines
drivers/staging/vme/devices/vme_user.c +0
-0
drivers/staging/vme/devices/vme_user.c static int vme_user_probe(struct vme_dev *vdev) · line 782
Quoted 8 lines
drivers/staging/vme/devices/vme_user.c +2
-1@@ -776,7 +776,8 @@ static int vme_user_probe(struct vme_dev *vdev) image[i].kern_buf =kmalloc (image[i].size_buf,GFP_KERNEL );if (image[i].kern_buf ==NULL ) { err = -ENOMEM ; - goto err_master_buf; +vme_master_free (image[i].resource); + goto err_master; } }
I think it would be nice to keep all of the cleanup under the err_master label.
That could be done by changing the kern_buf allocation in this part to a devm_kmalloc. Then devm handles the kern_buf freeing entirely.
Quoted 13 lines
drivers/staging/vme/devices/vme_user.c +0
-2@@ -819,8 +820,6 @@ static int vme_user_probe(struct vme_dev *vdev)return 0 ; -/* Ensure counter set correcty to destroy all sysfs devices */ - i =VME_DEVS ; err_sysfs:while (i >0 ) { i--;@@ -830,12 +829,10 @@ err_sysfs:/* Ensure counter set correcty to unalloc all master windows */
drivers/staging/vme/devices/vme_user.c err_sysfs: · line 837
Quoted 10 lines
drivers/staging/vme/devices/vme_user.c +1
-3i =MASTER_MAX +1 ; -err_master_buf: -for (i =MASTER_MINOR ; i < (MASTER_MAX +1 ); i++) -kfree (image[i].kern_buf); err_master:while (i >MASTER_MINOR ) { i--; +kfree (image[i].kern_buf);vme_master_free (image[i].resource); }
Using devm_kmalloc as mentioned above, the while loop could be simplified to this:
err_master:
while (i >= MASTER_MINOR) {
vme_master_free(image[i].resource);
i--;
}If not moving to devm, this should be safe even though the first kern_buf may be NULL:
err_master:
while (i >= MASTER_MINOR) {
kfree(image[i].kern_buf);
vme_master_free(image[i].resource);
i--;
}-Aaron
Quoted 6 lines
drivers/staging/vme/devices/vme_user.c +0
-1--1.7.4.4
2014-03-27 3:51 GMT+09:00 Aaron Sierra <[email protected]>:
Quoted 29 lines
----- Original Message -----
Quoted 8 lines
From: "Daeseok Youn" <[email protected]>
Sent: Tuesday, March 25, 2014 10:01:48 PM
Subject: [PATCH] staging: vme: fix memory leak invme_user_probe()If
vme_master_request()returns NULL when it failed, it need to free buffers for master.Quoted 6 lines
And also removes unreachable code in
vme_user_probe().Signed-off-by Daeseok Youn <[email protected]>--- drivers/staging/vme/devices/vme_user.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-)Nice catches Daeseok. I don't maintain this driver, but I have some suggestions below.
Quoted 10 lines
drivers/staging/vme/devices/vme_user.c +0
-0@@ -776,7 +776,8 @@ static int vme_user_probe(struct vme_dev *vdev) image[i].kern_buf =kmalloc (image[i].size_buf,GFP_KERNEL );if (image[i].kern_buf ==NULL ) { err = -ENOMEM ;
Quoted 8 lines
drivers/staging/vme/devices/vme_user.c static int vme_user_probe(struct vme_dev *vdev) · line 782
Quoted 5 lines
drivers/staging/vme/devices/vme_user.c +2
-1- goto err_master_buf; +vme_master_free (image[i].resource); + goto err_master; } }I think it would be nice to keep all of the cleanup under the
err_masterlabel.
Actually, I changed like "err_slave" doing. When it failed to alloc buffer for slave,
just called vme_slave_free(image[i].slave) and cleanup under the err_slave.
Quoted 3 lines
That could be done by changing the
kern_bufallocation in this part to adevm_kmalloc. Then devm handles thekern_buffreeing entirely.
I didn't know about devm_kmalloc(), I will check that function. Thanks!
Quoted 28 lines
Quoted 14 lines
drivers/staging/vme/devices/vme_user.c +0
-2@@ -819,8 +820,6 @@ static int vme_user_probe(struct vme_dev *vdev)return 0 ; -/* Ensure counter set correcty to destroy all sysfs devices */ - i =VME_DEVS ; err_sysfs:while (i >0 ) { i--;@@ -830,12 +829,10 @@ err_sysfs:/* Ensure counter set correcty to unalloc all master windows */ drivers/staging/vme/devices/vme_user.c err_sysfs: · line 837
Quoted 10 lines
drivers/staging/vme/devices/vme_user.c +1
-3i =MASTER_MAX +1 ; -err_master_buf: -for (i =MASTER_MINOR ; i < (MASTER_MAX +1 ); i++) -kfree (image[i].kern_buf); err_master:while (i >MASTER_MINOR ) { i--; +kfree (image[i].kern_buf);vme_master_free (image[i].resource); }Using
devm_kmallocas mentioned above, the while loop could be simplified to this:
Quoted 5 lines
err_master:while (i >= MASTER_MINOR) { vme_master_free(image[i].resource); i--; }
It would be nice, but when it failed to vme_master_request() and than go to err_master,
image[i].resource must be NULL. So a NULL exception has occurred in vme_master_free().
I think vme_master{slave}_free() need to check NULL and it can be possible to change code as your comment.
please check for me. :-)
Quoted 10 lines
If not moving to devm, this should be safe even though the first
kern_bufmay be NULL:
err_master:while (i >= MASTER_MINOR) { kfree(image[i].kern_buf); vme_master_free(image[i].resource); i--; }
kfree() is ok. But vme_master_free() function has an problem as mentioned above.
Thanks for review.
Daeseok Youn.
Quoted 9 lines
-Aaron
Quoted 6 lines
drivers/staging/vme/devices/vme_user.c +0
-1--1.7.4.4
----- Original Message -----
Quoted 41 lines
From: "DaeSeok Youn" <[email protected]>
Sent: Wednesday, March 26, 2014 8:47:51 PM2014-03-27 3:51 GMT+09:00 Aaron Sierra <[email protected]>:
Quoted 29 lines
----- Original Message -----
Quoted 8 lines
From: "Daeseok Youn" <[email protected]>
Sent: Tuesday, March 25, 2014 10:01:48 PM
Subject: [PATCH] staging: vme: fix memory leak invme_user_probe()If
vme_master_request()returns NULL when it failed, it need to free buffers for master.Quoted 6 lines
And also removes unreachable code in
vme_user_probe().Signed-off-by Daeseok Youn <[email protected]>--- drivers/staging/vme/devices/vme_user.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-)Nice catches Daeseok. I don't maintain this driver, but I have some suggestions below.
Quoted 10 lines
drivers/staging/vme/devices/vme_user.c +0
-0@@ -776,7 +776,8 @@ static int vme_user_probe(struct vme_dev *vdev) image[i].kern_buf =kmalloc (image[i].size_buf,GFP_KERNEL );if (image[i].kern_buf ==NULL ) { err = -ENOMEM ;Quoted 8 lines
drivers/staging/vme/devices/vme_user.c static int vme_user_probe(struct vme_dev *vdev) · line 782
Quoted 5 lines
drivers/staging/vme/devices/vme_user.c +2
-1- goto err_master_buf; +vme_master_free (image[i].resource); + goto err_master; } }I think it would be nice to keep all of the cleanup under the
err_masterlabel.
Quoted 3 lines
Actually, I changed like "
err_slave" doing. When it failed to alloc buffer for slave,
just calledvme_slave_free(image[i].slave)and cleanup under theerr_slave.
I do like the error path symmetry provided by your patch.
Quoted 38 lines
Quoted 3 lines
That could be done by changing the
kern_bufallocation in this part to adevm_kmalloc. Then devm handles thekern_buffreeing entirely.I didn't know about
devm_kmalloc(), I will check that function. Thanks!Quoted 28 lines
Quoted 14 lines
drivers/staging/vme/devices/vme_user.c +0
-2@@ -819,8 +820,6 @@ static int vme_user_probe(struct vme_dev *vdev)return 0 ; -/* Ensure counter set correcty to destroy all sysfs devices */ - i =VME_DEVS ; err_sysfs:while (i >0 ) { i--;@@ -830,12 +829,10 @@ err_sysfs:/* Ensure counter set correcty to unalloc all master windows */ drivers/staging/vme/devices/vme_user.c err_sysfs: · line 837
Quoted 10 lines
drivers/staging/vme/devices/vme_user.c +1
-3i =MASTER_MAX +1 ; -err_master_buf: -for (i =MASTER_MINOR ; i < (MASTER_MAX +1 ); i++) -kfree (image[i].kern_buf); err_master:while (i >MASTER_MINOR ) { i--; +kfree (image[i].kern_buf);vme_master_free (image[i].resource); }Using
devm_kmallocas mentioned above, the while loop could be simplified to this:Quoted 5 lines
err_master:while (i >= MASTER_MINOR) { vme_master_free(image[i].resource); i--; }
Quoted 8 lines
It would be nice, but when it failed to
vme_master_request()and than go toerr_master,
image[i].resource must be NULL. So a NULL exception has occurred invme_master_free().I think vme_master{slave}_free() need to check NULL and it can be possible to change code as your comment.
please check for me. :-)
You are correct that vme_master_free() assumes that the resource being freed is not NULL. I should have recognized that case. That could easily be handled by testing the resource again in the loop, but I see the benefit of the symmetry of your change.
-Aaron
Quoted 26 lines
Quoted 11 lines
If not moving to devm, this should be safe even though the first
kern_bufmay be NULL:
err_master:while (i >= MASTER_MINOR) { kfree(image[i].kern_buf); vme_master_free(image[i].resource); i--; }
kfree()is ok. Butvme_master_free()function has an problem as mentioned above.Thanks for review.
Daeseok Youn.Quoted 9 lines
-Aaron
Quoted 6 lines
drivers/staging/vme/devices/vme_user.c +0
-1--1.7.4.4
2014-03-27 23:30 GMT+09:00 Aaron Sierra <[email protected]>:
Quoted 92 lines
----- Original Message -----
Quoted 41 lines
From: "DaeSeok Youn" <[email protected]>
Sent: Wednesday, March 26, 2014 8:47:51 PM2014-03-27 3:51 GMT+09:00 Aaron Sierra <[email protected]>:
Quoted 29 lines
----- Original Message -----
Quoted 8 lines
From: "Daeseok Youn" <[email protected]>
Sent: Tuesday, March 25, 2014 10:01:48 PM
Subject: [PATCH] staging: vme: fix memory leak invme_user_probe()If
vme_master_request()returns NULL when it failed, it need to free buffers for master.Quoted 6 lines
And also removes unreachable code in
vme_user_probe().Signed-off-by Daeseok Youn <[email protected]>--- drivers/staging/vme/devices/vme_user.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-)Nice catches Daeseok. I don't maintain this driver, but I have some suggestions below.
Quoted 10 lines
drivers/staging/vme/devices/vme_user.c +0
-0@@ -776,7 +776,8 @@ static int vme_user_probe(struct vme_dev *vdev) image[i].kern_buf =kmalloc (image[i].size_buf,GFP_KERNEL );if (image[i].kern_buf ==NULL ) { err = -ENOMEM ;Quoted 8 lines
drivers/staging/vme/devices/vme_user.c static int vme_user_probe(struct vme_dev *vdev) · line 782
Quoted 5 lines
drivers/staging/vme/devices/vme_user.c +2
-1- goto err_master_buf; +vme_master_free (image[i].resource); + goto err_master; } }I think it would be nice to keep all of the cleanup under the
err_masterlabel.Quoted 3 lines
Actually, I changed like "
err_slave" doing. When it failed to alloc buffer for slave,
just calledvme_slave_free(image[i].slave)and cleanup under theerr_slave.I do like the error path symmetry provided by your patch.
Quoted 43 lines
Quoted 3 lines
That could be done by changing the
kern_bufallocation in this part to adevm_kmalloc. Then devm handles thekern_buffreeing entirely.I didn't know about
devm_kmalloc(), I will check that function. Thanks!Quoted 28 lines
Quoted 14 lines
drivers/staging/vme/devices/vme_user.c +0
-2@@ -819,8 +820,6 @@ static int vme_user_probe(struct vme_dev *vdev)return 0 ; -/* Ensure counter set correcty to destroy all sysfs devices */ - i =VME_DEVS ; err_sysfs:while (i >0 ) { i--;@@ -830,12 +829,10 @@ err_sysfs:/* Ensure counter set correcty to unalloc all master windows */ drivers/staging/vme/devices/vme_user.c err_sysfs: · line 837
Quoted 10 lines
drivers/staging/vme/devices/vme_user.c +1
-3i =MASTER_MAX +1 ; -err_master_buf: -for (i =MASTER_MINOR ; i < (MASTER_MAX +1 ); i++) -kfree (image[i].kern_buf); err_master:while (i >MASTER_MINOR ) { i--; +kfree (image[i].kern_buf);vme_master_free (image[i].resource); }Using
devm_kmallocas mentioned above, the while loop could be simplified to this:Quoted 5 lines
err_master:while (i >= MASTER_MINOR) { vme_master_free(image[i].resource); i--; }It would be nice, but when it failed to
vme_master_request()and than go toerr_master,
image[i].resource must be NULL. So a NULL exception has occurred invme_master_free().
Quoted 8 lines
Quoted 3 lines
I think vme_master{slave}_free() need to check NULL and it can be possible to change code as your comment.
please check for me. :-)You are correct that
vme_master_free()assumes that the resource being freed is not NULL. I should have recognized that case. That could easily be handled by testing the resource again in the loop, but I see the benefit of the symmetry of your change.
OK. I would leave the symmetry of my patch. :-)
Thanks for your reply.
Regards,
Daeseok Youn.
Quoted 29 lines
-Aaron
Quoted 26 lines
Quoted 11 lines
If not moving to devm, this should be safe even though the first
kern_bufmay be NULL:
err_master:while (i >= MASTER_MINOR) { kfree(image[i].kern_buf); vme_master_free(image[i].resource); i--; }
kfree()is ok. Butvme_master_free()function has an problem as mentioned above.Thanks for review.
Daeseok Youn.Quoted 9 lines
-Aaron
Quoted 6 lines
drivers/staging/vme/devices/vme_user.c +0
-1--1.7.4.4