diff options
| author | Sudip Mukherjee | 2015-11-28 16:49:24 +0100 |
|---|---|---|
| committer | Jens Axboe | 2015-11-29 22:34:57 +0100 |
| commit | 76e25081b6ae60fb094328dedf900ec15f10a9fd (patch) | |
| tree | 4c693cb15ec6985872a862414eb79f62a18748c7 /drivers/lightnvm/core.c | |
| parent | lightnvm: free memory when gennvm register fails (diff) | |
| download | kernel-qcow2-linux-76e25081b6ae60fb094328dedf900ec15f10a9fd.tar.gz kernel-qcow2-linux-76e25081b6ae60fb094328dedf900ec15f10a9fd.tar.xz kernel-qcow2-linux-76e25081b6ae60fb094328dedf900ec15f10a9fd.zip | |
lightnvm: fix ioctl memory leaks
If copy_to_user() fails we returned error but we missed releasing
devices.
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Matias Bjørling <m@bjorling.me>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/lightnvm/core.c')
| -rw-r--r-- | drivers/lightnvm/core.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c index 5178645ac42b..ea50fa5b6ba6 100644 --- a/drivers/lightnvm/core.c +++ b/drivers/lightnvm/core.c @@ -680,8 +680,10 @@ static long nvm_ioctl_info(struct file *file, void __user *arg) info->tgtsize = tgt_iter; up_write(&nvm_lock); - if (copy_to_user(arg, info, sizeof(struct nvm_ioctl_info))) + if (copy_to_user(arg, info, sizeof(struct nvm_ioctl_info))) { + kfree(info); return -EFAULT; + } kfree(info); return 0; @@ -724,8 +726,11 @@ static long nvm_ioctl_get_devices(struct file *file, void __user *arg) devices->nr_devices = i; - if (copy_to_user(arg, devices, sizeof(struct nvm_ioctl_get_devices))) + if (copy_to_user(arg, devices, + sizeof(struct nvm_ioctl_get_devices))) { + kfree(devices); return -EFAULT; + } kfree(devices); return 0; |