aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorThierry Escande <thierry.escande@linux.intel.com>2012-11-15 12:24:28 -0500
committerSamuel Ortiz <sameo@linux.intel.com>2012-11-19 18:09:26 -0500
commit5b412fd11c918171c98a253d8a3484afa9f69ca5 (patch)
treeab0fd2f2f58146a2c26d1ee415917b006577bdd0 /drivers
parent70418e6efcf4f8652cc08e3f2ab8ae35f0948fd9 (diff)
NFC: Fix pn533 target mode memory leak
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/nfc/pn533.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c
index 807bbb8e82d9..30ae18a03a9c 100644
--- a/drivers/nfc/pn533.c
+++ b/drivers/nfc/pn533.c
@@ -2077,8 +2077,12 @@ error:
2077static int pn533_tm_send_complete(struct pn533 *dev, void *arg, 2077static int pn533_tm_send_complete(struct pn533 *dev, void *arg,
2078 u8 *params, int params_len) 2078 u8 *params, int params_len)
2079{ 2079{
2080 struct sk_buff *skb_out = arg;
2081
2080 nfc_dev_dbg(&dev->interface->dev, "%s", __func__); 2082 nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
2081 2083
2084 dev_kfree_skb(skb_out);
2085
2082 if (params_len < 0) { 2086 if (params_len < 0) {
2083 nfc_dev_err(&dev->interface->dev, 2087 nfc_dev_err(&dev->interface->dev,
2084 "Error %d when sending data", 2088 "Error %d when sending data",
@@ -2116,7 +2120,7 @@ static int pn533_tm_send(struct nfc_dev *nfc_dev, struct sk_buff *skb)
2116 2120
2117 rc = pn533_send_cmd_frame_async(dev, out_frame, dev->in_frame, 2121 rc = pn533_send_cmd_frame_async(dev, out_frame, dev->in_frame,
2118 dev->in_maxlen, pn533_tm_send_complete, 2122 dev->in_maxlen, pn533_tm_send_complete,
2119 NULL, GFP_KERNEL); 2123 skb, GFP_KERNEL);
2120 if (rc) { 2124 if (rc) {
2121 nfc_dev_err(&dev->interface->dev, 2125 nfc_dev_err(&dev->interface->dev,
2122 "Error %d when trying to send data", rc); 2126 "Error %d when trying to send data", rc);