From 967240e0538103dba1250b310a1508cf29a6df8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Date: Mon, 13 Oct 2008 18:43:59 -0700 Subject: [PATCH] --- yaml --- r: 114249 b: refs/heads/master c: b4bb4ac8cb05ab5c13dfb7b47ef243982d3ad526 h: refs/heads/master i: 114247: e23fde14378591da7fcfc85d80f30d53ac3c9875 v: v3 --- [refs] | 2 +- trunk/net/core/pktgen.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d3fe19b7604a..b9960d571d83 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e9540b8f7b91c8818e2386add3b58a961459166 +refs/heads/master: b4bb4ac8cb05ab5c13dfb7b47ef243982d3ad526 diff --git a/trunk/net/core/pktgen.c b/trunk/net/core/pktgen.c index a756847e3814..99f656d35b4f 100644 --- a/trunk/net/core/pktgen.c +++ b/trunk/net/core/pktgen.c @@ -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