diff options
| author | Daeseok Youn | 2014-03-26 04:01:48 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-04-15 23:46:43 +0200 |
| commit | 1a52489318c16aaff71059b3892a1a2f3bb8ecec (patch) | |
| tree | 1c5162477fe64b84cb30963c017ce318702ae7b1 /drivers/staging/vme/devices | |
| parent | staging: fpgaboot: clean up Makefile (diff) | |
| download | kernel-qcow2-linux-1a52489318c16aaff71059b3892a1a2f3bb8ecec.tar.gz kernel-qcow2-linux-1a52489318c16aaff71059b3892a1a2f3bb8ecec.tar.xz kernel-qcow2-linux-1a52489318c16aaff71059b3892a1a2f3bb8ecec.zip | |
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().
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vme/devices')
| -rw-r--r-- | drivers/staging/vme/devices/vme_user.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c index 792792715673..ffb4eeefdddb 100644 --- a/drivers/staging/vme/devices/vme_user.c +++ b/drivers/staging/vme/devices/vme_user.c @@ -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); } |