]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
NFC: Fix pn533 target mode memory leak
authorThierry Escande <thierry.escande@linux.intel.com>
Thu, 15 Nov 2012 17:24:28 +0000 (18:24 +0100)
committerSamuel Ortiz <sameo@linux.intel.com>
Mon, 19 Nov 2012 23:09:26 +0000 (00:09 +0100)
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>
drivers/nfc/pn533.c

index 807bbb8e82d95e475f3c6e189f60198fc0666f76..30ae18a03a9ccc650a195547086866a66646cd98 100644 (file)
@@ -2077,8 +2077,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",
@@ -2116,7 +2120,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);