summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorWaldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>2013-04-03 08:02:03 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2013-04-11 16:29:02 +0200
commit0ce1fbdd609875f523de0d8179c6f4f8500807c7 (patch)
tree3af6ae3667cc53d7b48cecf0a22b73bbae99c945 /drivers/nfc
parentf75c291361fc646d42cd62d8ebfbdecaa13077cc (diff)
downloadlinux-0ce1fbdd609875f523de0d8179c6f4f8500807c7.tar.gz
linux-0ce1fbdd609875f523de0d8179c6f4f8500807c7.tar.bz2
linux-0ce1fbdd609875f523de0d8179c6f4f8500807c7.zip
NFC: pn533: Fix memleak while scheduling next cmd
In case of error from __pn533_send_frame_async() while sending next cmd from the queue (cmd_wq), cmd->req, cmd->resp and cmd->arg pointers won't be freed. Signed-off-by: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/pn533.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c
index 24ffbe04108b..48902e58cacb 100644
--- a/drivers/nfc/pn533.c
+++ b/drivers/nfc/pn533.c
@@ -886,6 +886,7 @@ static void pn533_wq_cmd(struct work_struct *work)
{
struct pn533 *dev = container_of(work, struct pn533, cmd_work);
struct pn533_cmd *cmd;
+ int rc;
mutex_lock(&dev->cmd_lock);
@@ -901,8 +902,13 @@ static void pn533_wq_cmd(struct work_struct *work)
mutex_unlock(&dev->cmd_lock);
- __pn533_send_frame_async(dev, cmd->req, cmd->resp, cmd->resp_len,
- pn533_send_async_complete, cmd->arg);
+ rc = __pn533_send_frame_async(dev, cmd->req, cmd->resp, cmd->resp_len,
+ pn533_send_async_complete, cmd->arg);
+ if (rc < 0) {
+ dev_kfree_skb(cmd->req);
+ dev_kfree_skb(cmd->resp);
+ kfree(cmd->arg);
+ }
kfree(cmd);
}