diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-04-24 05:11:51 +0000 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-04-25 01:58:16 +0200 |
commit | e7e6f6300faaafe05380ca5455b99c2a8f1f51a0 (patch) | |
tree | 8cc32d8903407af60dcce69b34ab961b94bd01b8 /net/netfilter | |
parent | 38561437d056b11f679f9735d68ad597ba67dc84 (diff) | |
download | op-kernel-dev-e7e6f6300faaafe05380ca5455b99c2a8f1f51a0.zip op-kernel-dev-e7e6f6300faaafe05380ca5455b99c2a8f1f51a0.tar.gz |
netfilter: nf_nat: missing condition in nf_xfrm_me_harder()
This if statement was accidentally dropped in (aaa795a netfilter:
nat: propagate errors from xfrm_me_harder()) so now it returns
unconditionally.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter')
-rw-r--r-- | net/netfilter/nf_nat_core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c index 346f871..cf1c731 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 < 0) return err; dst = skb_dst(skb); |