---

yaml --- r: 201087 b: refs/heads/master c: e40dbc5 h: refs/heads/master i: 201085: ecb92bd 201083: 379b98a 201079: 6ce726d 201071: e751f1b 201055: e0aaab7 201023: 633499c 200959: bfa5812 v: v3
git-mirror · Jul 16, 2010 · 7481c04 · 7481c04
1 parent 127a998
commit 7481c04
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0f77d0eae0c58a5a9691a067ada112ceeae2d00
+refs/heads/master: e40dbc51fbcc3281bb52ecf0f5bec693d36e2aea
diff --git a/trunk/net/ipv4/ipmr.c b/trunk/net/ipv4/ipmr.c
@@ -442,8 +442,10 @@ static netdev_tx_t reg_vif_xmit(struct sk_buff *skb, struct net_device *dev)
 	int err;
 
 	err = ipmr_fib_lookup(net, &fl, &mrt);
-	if (err < 0)
+	if (err < 0) {
+		kfree_skb(skb);
 		return err;
+	}
 
 	read_lock(&mrt_lock);
 	dev->stats.tx_bytes += skb->len;
@@ -1728,8 +1730,10 @@ int ip_mr_input(struct sk_buff *skb)
 		goto dont_forward;
 
 	err = ipmr_fib_lookup(net, &skb_rtable(skb)->fl, &mrt);
-	if (err < 0)
+	if (err < 0) {
+		kfree_skb(skb);
 		return err;
+	}
 
 	if (!local) {
 		    if (IPCB(skb)->opt.router_alert) {