| From | Greg Kroah-Hartman <> | Subject | [ 45/54] NFC: Fix pn533 target mode memory leak | Date | Fri, 30 Nov 2012 10:56:16 -0800 |
| |
3.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thierry Escande <thierry.escande@linux.intel.com>
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>
--- drivers/nfc/pn533.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
--- 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 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);
|