diff options
| author | Thierry Escande <thierry.escande@linux.intel.com> | 2012-11-15 18:24:28 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-03 11:38:14 -0800 |
| commit | 288267200ed15a769b2ec0045873c7afdf759d42 (patch) | |
| tree | a2fb7d7f00b71832f14659ab75bcb4f620ee1864 /drivers | |
| parent | ae93d015d1868e5cdfb2329df4e7102b3eddbf1f (diff) | |
NFC: Fix pn533 target mode memory leak
commit 5b412fd11c918171c98a253d8a3484afa9f69ca5 upstream.
In target mode, sent sk_buff were not freed in pn533_tm_send_complete
Signed-off-by: Thierry Escande <thierry.escande@linux.intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/nfc/pn533.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c index 413fcad3833..ac520406e13 100644 --- a/drivers/nfc/pn533.c +++ b/drivers/nfc/pn533.c @@ -2014,8 +2014,12 @@ error: static int pn533_tm_send_complete(struct pn533 *dev, void *arg, u8 *params, int params_len) { + struct sk_buff *skb_out = arg; + nfc_dev_dbg(&dev->interface->dev, "%s", __func__); + dev_kfree_skb(skb_out); + if (params_len < 0) { nfc_dev_err(&dev->interface->dev, "Error %d when sending data", @@ -2053,7 +2057,7 @@ static int pn533_tm_send(struct nfc_dev *nfc_dev, struct sk_buff *skb) rc = pn533_send_cmd_frame_async(dev, out_frame, dev->in_frame, dev->in_maxlen, pn533_tm_send_complete, - NULL, GFP_KERNEL); + skb, GFP_KERNEL); if (rc) { nfc_dev_err(&dev->interface->dev, "Error %d when trying to send data", rc); |