Message ID | 20130424151151.GA16783@elgon.mountain |
---|---|
State | Accepted |
Headers | show |
On Wed, Apr 24, 2013 at 06:11:51PM +0300, Dan Carpenter wrote: > This if statement was accidentally dropped in a merge commit so now it > returns unconditionally. Applied, thanks Dan. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c index 2e469ca..d4c9a31 100644 --- a/net/netfilter/nf_nat_core.c +++ b/net/netfilter/nf_nat_core.c @@ -90,6 +90,7 @@ int nf_xfrm_me_harder(struct sk_buff *skb, unsigned int family) int err; err = xfrm_decode_session(skb, &fl, family); + if (err) return err; dst = skb_dst(skb);
This if statement was accidentally dropped in a merge commit so now it returns unconditionally. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html