Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76e25081 authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Jens Axboe
Browse files

lightnvm: fix ioctl memory leaks 



If copy_to_user() fails we returned error but we missed releasing
devices.

Signed-off-by: default avatarSudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: default avatarMatias Bjørling <m@bjorling.me>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 8261bd48

drivers/lightnvm/core.c

+7 −2
Original line number Diff line number Diff line
@@ -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;