diff options
| author | Eric Dumazet <edumazet@google.com> | 2022-05-13 11:55:49 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-05-16 10:31:06 +0100 |
| commit | 5d368f03280d3678433a7f119efe15dfbbb87bc8 (patch) | |
| tree | 1749bbca069fafab9219ea4187c460d12c2c6bc7 /net/ipv4/inet_hashtables.c | |
| parent | ff0094030f146b44eba0da2d3f9dbddaa28ee3c0 (diff) | |
| download | lwn-5d368f03280d3678433a7f119efe15dfbbb87bc8.tar.gz lwn-5d368f03280d3678433a7f119efe15dfbbb87bc8.zip | |
ipv6: add READ_ONCE(sk->sk_bound_dev_if) in INET6_MATCH()
INET6_MATCH() runs without holding a lock on the socket.
We probably need to annotate most reads.
This patch makes INET6_MATCH() an inline function
to ease our changes.
v2: inline function only defined if IS_ENABLED(CONFIG_IPV6)
Change the name to inet6_match(), this is no longer a macro.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_hashtables.c')
| -rw-r--r-- | net/ipv4/inet_hashtables.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c index 5257a7575649..acec83ef8220 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c @@ -499,7 +499,7 @@ static bool inet_ehash_lookup_by_sk(struct sock *sk, } #if IS_ENABLED(CONFIG_IPV6) else if (sk->sk_family == AF_INET6) { - if (unlikely(INET6_MATCH(esk, net, + if (unlikely(inet6_match(net, esk, &sk->sk_v6_daddr, &sk->sk_v6_rcv_saddr, ports, dif, sdif))) { |