diff options
| author |   Kuniyuki Iwashima <kuniyu@amazon.com> | 2022-07-15 10:17:44 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2022-07-18 12:21:54 +0100 |
| commit | 8ebcc62c738f68688ee7c6fec2efe5bc6d3d7e60 (patch) | |
| tree | 4c8bd4448184cb1cff4998270a0d4819b972f15d /drivers | |
| parent | igmp: Fix data-races around sysctl_igmp_max_msf. (diff) | |
| download | linux-dev-8ebcc62c738f68688ee7c6fec2efe5bc6d3d7e60.tar.xz linux-dev-8ebcc62c738f68688ee7c6fec2efe5bc6d3d7e60.zip | |
igmp: Fix data-races around sysctl_igmp_qrv.
While reading sysctl_igmp_qrv, it can be changed concurrently.
Thus, we need to add READ_ONCE() to its readers.
This test can be packed into a helper, so such changes will be in the
follow-up series after net is merged into net-next.
qrv ?: READ_ONCE(net->ipv4.sysctl_igmp_qrv);
Fixes: a9fe8e29945d ("ipv4: implement igmp_qrv sysctl to tune igmp robustness variable")
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/amt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/amt.c b/drivers/net/amt.c index be2719a3ba70..89563d1b2a3b 100644 --- a/drivers/net/amt.c +++ b/drivers/net/amt.c @@ -563,7 +563,7 @@ static struct sk_buff *amt_build_igmp_gq(struct amt_dev *amt) ihv3->nsrcs = 0; ihv3->resv = 0; ihv3->suppress = false; - ihv3->qrv = amt->net->ipv4.sysctl_igmp_qrv; + ihv3->qrv = READ_ONCE(amt->net->ipv4.sysctl_igmp_qrv); ihv3->csum = 0; csum = &ihv3->csum; csum_start = (void *)ihv3; @@ -3095,7 +3095,7 @@ static int amt_newlink(struct net *net, struct net_device *dev, goto err; } if (amt->mode == AMT_MODE_RELAY) { - amt->qrv = amt->net->ipv4.sysctl_igmp_qrv; + amt->qrv = READ_ONCE(amt->net->ipv4.sysctl_igmp_qrv); amt->qri = 10; dev->needed_headroom = amt->stream_dev->needed_headroom + AMT_RELAY_HLEN; |