Message ID | 1316819461-3192-1-git-send-email-greearb@candelatech.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: greearb@candelatech.com Date: Fri, 23 Sep 2011 16:11:01 -0700 > From: Ben Greear <greearb@candelatech.com> > > If reg_vif_xmit cannot find a routing entry, be sure to > free the skb before returning the error. > > Signed-off-by: Ben Greear <greearb@candelatech.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 09/27/2011 12:34 PM, David Miller wrote: > From: greearb@candelatech.com > Date: Fri, 23 Sep 2011 16:11:01 -0700 > >> From: Ben Greear<greearb@candelatech.com> >> >> If reg_vif_xmit cannot find a routing entry, be sure to >> free the skb before returning the error. >> >> Signed-off-by: Ben Greear<greearb@candelatech.com> > > Applied. This one has not made it to 3.0 stable either. Ben
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 82a8099..e9a8df9 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -696,8 +696,10 @@ static netdev_tx_t reg_vif_xmit(struct sk_buff *skb, int err; err = ip6mr_fib_lookup(net, &fl6, &mrt); - if (err < 0) + if (err < 0) { + kfree_skb(skb); return err; + } read_lock(&mrt_lock); dev->stats.tx_bytes += skb->len;