diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 16:47:29 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 16:47:29 (GMT) |
commit | fdccffc6b711d1bfcd1e1b569537686dcad423e2 (patch) | |
tree | 51a4cdfad5ed6ea0fcec697f0f8e53a1d33ef326 /net/ipv6 | |
parent | 4fa639123d9e6e8dfaa3d116368f4b2478da31af (diff) | |
parent | 3eb4801d7bde42b82f05137392a1ee0ece090bad (diff) | |
download | linux-fdccffc6b711d1bfcd1e1b569537686dcad423e2.tar.xz |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NET]: drop duplicate assignment in request_sock
[IPSEC]: Fix tunnel error handling in ipcomp6
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/ipcomp6.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c index 028b636..d4cfec3 100644 --- a/net/ipv6/ipcomp6.c +++ b/net/ipv6/ipcomp6.c @@ -228,6 +228,9 @@ static struct xfrm_state *ipcomp6_tunnel_create(struct xfrm_state *x) t->id.proto = IPPROTO_IPV6; t->id.spi = xfrm6_tunnel_alloc_spi((xfrm_address_t *)&x->props.saddr); + if (!t->id.spi) + goto error; + memcpy(t->id.daddr.a6, x->id.daddr.a6, sizeof(struct in6_addr)); memcpy(&t->sel, &x->sel, sizeof(t->sel)); t->props.family = AF_INET6; @@ -243,7 +246,9 @@ out: return t; error: + t->km.state = XFRM_STATE_DEAD; xfrm_state_put(t); + t = NULL; goto out; } |