diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 08:47:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 08:47:29 -0800 |
| commit | fdccffc6b711d1bfcd1e1b569537686dcad423e2 (patch) | |
| tree | 51a4cdfad5ed6ea0fcec697f0f8e53a1d33ef326 /net | |
| parent | 4fa639123d9e6e8dfaa3d116368f4b2478da31af (diff) | |
| parent | 3eb4801d7bde42b82f05137392a1ee0ece090bad (diff) | |
| download | kernel_samsung_aries-fdccffc6b711d1bfcd1e1b569537686dcad423e2.zip kernel_samsung_aries-fdccffc6b711d1bfcd1e1b569537686dcad423e2.tar.gz kernel_samsung_aries-fdccffc6b711d1bfcd1e1b569537686dcad423e2.tar.bz2 | |
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')
| -rw-r--r-- | net/core/request_sock.c | 2 | ||||
| -rw-r--r-- | net/ipv6/ipcomp6.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/net/core/request_sock.c b/net/core/request_sock.c index 98f0fc9..1e44eda 100644 --- a/net/core/request_sock.c +++ b/net/core/request_sock.c @@ -51,7 +51,7 @@ int reqsk_queue_alloc(struct request_sock_queue *queue, get_random_bytes(&lopt->hash_rnd, sizeof(lopt->hash_rnd)); rwlock_init(&queue->syn_wait_lock); - queue->rskq_accept_head = queue->rskq_accept_head = NULL; + queue->rskq_accept_head = NULL; lopt->nr_table_entries = nr_table_entries; write_lock_bh(&queue->syn_wait_lock); 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; } |