diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2013-10-21 22:05:38 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-29 11:11:52 -0800 |
| commit | bd7e08189efba225bfa173372b05682ac141af88 (patch) | |
| tree | 250a3a4804ea5c4398292a7a1ccdfa7be87fb696 /drivers/misc/mei | |
| parent | 7adb120526cf06bc2c0a8449194172ecfb62c730 (diff) | |
| download | linux-3.10-bd7e08189efba225bfa173372b05682ac141af88.tar.gz linux-3.10-bd7e08189efba225bfa173372b05682ac141af88.tar.bz2 linux-3.10-bd7e08189efba225bfa173372b05682ac141af88.zip | |
mei: nfc: fix memory leak in error path
commit 4bff7208f332b2b1d7cf1338e50527441283a198 upstream.
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: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei')
| -rw-r--r-- | drivers/misc/mei/nfc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/misc/mei/nfc.c b/drivers/misc/mei/nfc.c index d0c6907dfd9..994ca4aff1a 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); |