diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2006-03-13 23:26:12 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-03-13 23:26:12 +0100 |
| commit | 3759fa9c55923f719ae944a3f8fbb029b36f759d (patch) | |
| tree | ca48147798cd6a02edf64290dcf14c7681ab88cc | |
| parent | [PATCH] x86-64: Fix up handling of non canonical user RIPs (diff) | |
| download | linux-3759fa9c55923f719ae944a3f8fbb029b36f759d.tar.xz linux-3759fa9c55923f719ae944a3f8fbb029b36f759d.zip | |
[TCP]: Fix zero port problem in IPv6
When we link a socket into the hash table, we need to make sure that we
set the num/port fields so that it shows us with a non-zero port value
in proc/netlink and on the wire. This code and comment is copied over
from the IPv4 stack as is.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | net/ipv6/inet6_hashtables.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c index 4154f3a8b6cf..bb8ffb8a14c5 100644 --- a/net/ipv6/inet6_hashtables.c +++ b/net/ipv6/inet6_hashtables.c @@ -87,7 +87,7 @@ static int __inet6_check_established(struct inet_timewait_death_row *death_row, struct inet_timewait_sock **twp) { struct inet_hashinfo *hinfo = death_row->hashinfo; - const struct inet_sock *inet = inet_sk(sk); + struct inet_sock *inet = inet_sk(sk); const struct ipv6_pinfo *np = inet6_sk(sk); const struct in6_addr *daddr = &np->rcv_saddr; const struct in6_addr *saddr = &np->daddr; @@ -129,6 +129,10 @@ static int __inet6_check_established(struct inet_timewait_death_row *death_row, } unique: + /* Must record num and sport now. Otherwise we will see + * in hash table socket with a funny identity. */ + inet->num = lport; + inet->sport = htons(lport); BUG_TRAP(sk_unhashed(sk)); __sk_add_node(sk, &head->chain); sk->sk_hash = hash; |