From: Tomas Winkler <tomas.winkler@intel.com>
To: gregkh@linuxfoundation.org
Cc: arnd@arndb.de, linux-kernel@vger.kernel.org,
Tomas Winkler <tomas.winkler@intel.com>, <stable@vger.kernel.org>,
Samuel Ortiz <sameo@linux.intel.com>
Subject: [char-misc-next 3/8] mei: nfc: fix memory leak in error path
Date: Mon, 21 Oct 2013 22:05:38 +0300 [thread overview]
Message-ID: <1382382343-12066-4-git-send-email-tomas.winkler@intel.com> (raw)
In-Reply-To: <1382382343-12066-1-git-send-email-tomas.winkler@intel.com>
The flow may reach the err label without freeing cl and cl_info
cl and cl_info weren't assigned to ndev->cl and cl_info
so they weren't freed in mei_nfc_free called on error path
Cc: <stable@vger.kernel.org> # 3.10+
Cc: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
drivers/misc/mei/nfc.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/misc/mei/nfc.c b/drivers/misc/mei/nfc.c
index d0c6907..994ca4a 100644
--- a/drivers/misc/mei/nfc.c
+++ b/drivers/misc/mei/nfc.c
@@ -485,8 +485,11 @@ int mei_nfc_host_init(struct mei_device *dev)
if (ndev->cl_info)
return 0;
- cl_info = mei_cl_allocate(dev);
- cl = mei_cl_allocate(dev);
+ ndev->cl_info = mei_cl_allocate(dev);
+ ndev->cl = mei_cl_allocate(dev);
+
+ cl = ndev->cl;
+ cl_info = ndev->cl_info;
if (!cl || !cl_info) {
ret = -ENOMEM;
@@ -527,10 +530,9 @@ int mei_nfc_host_init(struct mei_device *dev)
cl->device_uuid = mei_nfc_guid;
+
list_add_tail(&cl->device_link, &dev->device_list);
- ndev->cl_info = cl_info;
- ndev->cl = cl;
ndev->req_id = 1;
INIT_WORK(&ndev->init_work, mei_nfc_init);
--
1.8.3.1
next prev parent reply other threads:[~2013-10-21 19:15 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-21 19:05 [char-misc-next 0/8] mei security fixes and cleanups Tomas Winkler
2013-10-21 19:05 ` [char-misc-next 1/8] mei: debugfs: validate dev is not null Tomas Winkler
2013-10-29 23:18 ` Greg KH
2013-10-30 7:16 ` Winkler, Tomas
2013-10-30 13:26 ` Greg KH
2013-10-30 21:14 ` Winkler, Tomas
2013-10-21 19:05 ` [char-misc-next 2/8] mei: hbm: validate client index is not exceeding allocated array size Tomas Winkler
2013-10-29 23:19 ` Greg KH
2013-10-30 7:31 ` Winkler, Tomas
2013-10-30 13:27 ` Greg KH
2013-11-07 12:21 ` Winkler, Tomas
2013-10-21 19:05 ` Tomas Winkler [this message]
2013-10-21 19:05 ` [char-misc-next 4/8] mei: wd: host_init propagate error codes from called functions Tomas Winkler
2013-10-21 19:05 ` [char-misc-next 5/8] mei: bus: propagate error code returned by mei_me_cl_by_id Tomas Winkler
2013-10-21 19:05 ` [char-misc-next 6/8] mei: mei_cl_link remove duplicated check for open_handle_count Tomas Winkler
2013-10-21 19:05 ` [char-misc-next 7/8] mei: replace stray pr_debug with dev_dbg Tomas Winkler
2013-10-21 19:05 ` [char-misc-next 8/8] mei: print correct device state during unexpected reset Tomas Winkler
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=1382382343-12066-4-git-send-email-tomas.winkler@intel.com \
--to=tomas.winkler@intel.com \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sameo@linux.intel.com \
--cc=stable@vger.kernel.org \
/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®