aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEric Sesterhenn <snakebyte@gmx.de>2007-04-28 21:26:23 -0700
committerDavid S. Miller <davem@davemloft.net>2007-04-28 21:26:23 -0700
commitd0772b70faaf8e9f2013b6c4273d94d5eac8047a (patch)
tree2370bf3e1159394c1fd25414ee72ec96da57c32c /net
parent[TCP]: Update references in two old comments (diff)
downloadlinux-dev-d0772b70faaf8e9f2013b6c4273d94d5eac8047a.tar.xz
linux-dev-d0772b70faaf8e9f2013b6c4273d94d5eac8047a.zip
[IPV6]: Fix slab corruption running ip6sic
From: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/xfrm6_tunnel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c
index 538499a89975..5502cc948dfb 100644
--- a/net/ipv6/xfrm6_tunnel.c
+++ b/net/ipv6/xfrm6_tunnel.c
@@ -261,7 +261,7 @@ static int xfrm6_tunnel_rcv(struct sk_buff *skb)
__be32 spi;
spi = xfrm6_tunnel_spi_lookup((xfrm_address_t *)&iph->saddr);
- return xfrm6_rcv_spi(skb, spi);
+ return xfrm6_rcv_spi(skb, spi) > 0 ? : 0;
}
static int xfrm6_tunnel_err(struct sk_buff *skb, struct inet6_skb_parm *opt,