mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Matias Bjørling" <m@bjorling.me>
To: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, axboe@fb.com
Cc: hch@infradead.org, keith.busch@intel.com,
	sudipm.mukherjee@gmail.com, ww.tao0320@gmail.com,
	"Sudip Mukherjee" <sudip@vectorindia.org>,
	"Matias Bjørling" <m@bjorling.me>
Subject: [PATCH 3/7] lightnvm: fix ioctl memory leaks
Date: Sat, 28 Nov 2015 16:49:24 +0100	[thread overview]
Message-ID: <1448725768-11992-4-git-send-email-m@bjorling.me> (raw)
In-Reply-To: <1448725768-11992-1-git-send-email-m@bjorling.me>

From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>

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>
---
 drivers/lightnvm/core.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
index 5178645..ea50fa5 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;
-- 
2.1.4


  parent reply	other threads:[~2015-11-28 15:50 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-28 15:49 [PATCH 0/7] Fixes for LightNVM Matias Bjørling
2015-11-28 15:49 ` [PATCH 1/7] lightnvm: Simplify config when disabled Matias Bjørling
2015-11-28 15:49 ` [PATCH 2/7] lightnvm: free memory when gennvm register fails Matias Bjørling
2015-11-28 15:49 ` Matias Bjørling [this message]
2015-11-28 15:49 ` [PATCH 4/7] lightnvm: do device max sectors boundary check first Matias Bjørling
2015-11-28 15:49 ` [PATCH 5/7] lightnvm: refactor and change vendor id for qemu Matias Bjørling
2015-11-28 15:49 ` [PATCH 6/7] lightnvm: unconverted ppa returned in get_bb_tbl Matias Bjørling
2015-11-28 15:49 ` [PATCH 7/7] lightnvm: missing nvm_lock acquire Matias Bjørling
2015-11-30 15:40 ` [PATCH 0/7] Fixes for LightNVM Jens Axboe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1448725768-11992-4-git-send-email-m@bjorling.me \
    --to=m@bjorling.me \
    --cc=axboe@fb.com \
    --cc=hch@infradead.org \
    --cc=keith.busch@intel.com \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sudip@vectorindia.org \
    --cc=sudipm.mukherjee@gmail.com \
    --cc=ww.tao0320@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®