]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
pktgen: fix skb leak in case of failure
authorIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Tue, 14 Oct 2008 01:43:59 +0000 (18:43 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 14 Oct 2008 01:43:59 +0000 (18:43 -0700)
Seems that skb goes into void unless something magic happened
in pskb_expand_head in case of failure.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/pktgen.c

index a756847e3814e5fc9e425f105acfd2984eccb33a..99f656d35b4f5556be314cbb3ec4c732228f5709 100644 (file)
@@ -2474,7 +2474,7 @@ static inline int process_ipsec(struct pktgen_dev *pkt_dev,
                                if (ret < 0) {
                                        printk(KERN_ERR "Error expanding "
                                               "ipsec packet %d\n",ret);
-                                       return 0;
+                                       goto err;
                                }
                        }
 
@@ -2484,8 +2484,7 @@ static inline int process_ipsec(struct pktgen_dev *pkt_dev,
                        if (ret) {
                                printk(KERN_ERR "Error creating ipsec "
                                       "packet %d\n",ret);
-                               kfree_skb(skb);
-                               return 0;
+                               goto err;
                        }
                        /* restore ll */
                        eth = (__u8 *) skb_push(skb, ETH_HLEN);
@@ -2494,6 +2493,9 @@ static inline int process_ipsec(struct pktgen_dev *pkt_dev,
                }
        }
        return 1;
+err:
+       kfree_skb(skb);
+       return 0;
 }
 #endif