ipv6: add READ_ONCE(sk->sk_bound_dev_if) in INET6_MATCH()
[ Upstream commit 5d368f03280d3678433a7f119efe15dfbbb87bc8 ] 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
b7325b27d8
commit
0de9b3f81e
@@ -71,12 +71,12 @@ begin:
|
||||
sk_nulls_for_each_rcu(sk, node, &head->chain) {
|
||||
if (sk->sk_hash != hash)
|
||||
continue;
|
||||
if (!INET6_MATCH(sk, net, saddr, daddr, ports, dif, sdif))
|
||||
if (!inet6_match(net, sk, saddr, daddr, ports, dif, sdif))
|
||||
continue;
|
||||
if (unlikely(!refcount_inc_not_zero(&sk->sk_refcnt)))
|
||||
goto out;
|
||||
|
||||
if (unlikely(!INET6_MATCH(sk, net, saddr, daddr, ports, dif, sdif))) {
|
||||
if (unlikely(!inet6_match(net, sk, saddr, daddr, ports, dif, sdif))) {
|
||||
sock_gen_put(sk);
|
||||
goto begin;
|
||||
}
|
||||
@@ -269,7 +269,7 @@ static int __inet6_check_established(struct inet_timewait_death_row *death_row,
|
||||
if (sk2->sk_hash != hash)
|
||||
continue;
|
||||
|
||||
if (likely(INET6_MATCH(sk2, net, saddr, daddr, ports,
|
||||
if (likely(inet6_match(net, sk2, saddr, daddr, ports,
|
||||
dif, sdif))) {
|
||||
if (sk2->sk_state == TCP_TIME_WAIT) {
|
||||
tw = inet_twsk(sk2);
|
||||
|
Reference in New Issue
Block a user