diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2008-01-18 12:27:12 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-21 05:31:36 +0100 |
| commit | b3652b2dc5ec6ccd946ae9136b30c6babb81305a (patch) | |
| tree | 2818c05ca3500de108b39c811082d1d439ae3879 /net | |
| parent | rfkill: call rfkill_led_trigger_unregister() on error (diff) | |
| download | linux-b3652b2dc5ec6ccd946ae9136b30c6babb81305a.tar.xz linux-b3652b2dc5ec6ccd946ae9136b30c6babb81305a.zip | |
[IPV6]: Mischecked tw match in __inet6_check_established.
When looking for a conflicting connection the !sk->sk_bound_dev_if
check is performed only for live sockets, but not for timewait-ed.
This is not the case for ipv4, for __inet6_lookup_established in
both ipv4 and ipv6 and for other places that check for tw-s.
Was this missed accidentally? If so, then this patch fixes it and
besides makes use if the dif variable declared in the function.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/inet6_hashtables.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c index adc73adadfae..0765d8bd380f 100644 --- a/net/ipv6/inet6_hashtables.c +++ b/net/ipv6/inet6_hashtables.c @@ -193,7 +193,7 @@ static int __inet6_check_established(struct inet_timewait_death_row *death_row, sk2->sk_family == PF_INET6 && ipv6_addr_equal(&tw6->tw_v6_daddr, saddr) && ipv6_addr_equal(&tw6->tw_v6_rcv_saddr, daddr) && - sk2->sk_bound_dev_if == sk->sk_bound_dev_if) { + (!sk2->sk_bound_dev_if || sk2->sk_bound_dev_if == dif)) { if (twsk_unique(sk, sk2, twp)) goto unique; else |