From 7481c047ade02adbeace3dc6c5d8918000ab7b67 Mon Sep 17 00:00:00 2001
From: Ben Greear <greearb@candelatech.com>
Date: Thu, 15 Jul 2010 13:22:33 +0000
Subject: [PATCH] --- yaml --- r: 201087 b: refs/heads/master c:
 e40dbc51fbcc3281bb52ecf0f5bec693d36e2aea h: refs/heads/master i:   201085:
 ecb92bd0611d925e2d783e4dc0b47c22d36b737c   201083:
 379b98a30f40a7b39f65cb4ddadf9f4e6abb8f92   201079:
 6ce726dabcb3287a8e7fad23274dbbdb1b1cf48b   201071:
 e751f1b0f1ece51f0ba7e9f8f8ef5db29d8c240e   201055:
 e0aaab7581e6a6f97cee22ee6f794e580c3fbc38   201023:
 633499cea790e1e133e2061cba25ae32e68a3260   200959:
 bfa5812a5b683278259826348457e38383dbb87c v: v3

---
 [refs]                | 2 +-
 trunk/net/ipv4/ipmr.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 243d272bb44c..c1eb5fe56f8d 100644
--- 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
index 757f25eb9b4b..7f6273506eea 100644
--- 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) {