diff options
| author |   Kuniyuki Iwashima <kuniyu@amazon.com> | 2022-08-23 10:46:44 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2022-08-24 13:46:57 +0100 |
| commit | 1227c1771dd2ad44318aa3ab9e3a293b3f34ff2a (patch) | |
| tree | 6e6eef2a68c70de96ec16d26192138ea296972bf /net/core/filter.c | |
| parent | net/core/skbuff: Check the return value of skb_copy_bits() (diff) | |
| download | linux-dev-1227c1771dd2ad44318aa3ab9e3a293b3f34ff2a.tar.xz linux-dev-1227c1771dd2ad44318aa3ab9e3a293b3f34ff2a.zip | |
net: Fix data-races around sysctl_[rw]mem_(max|default).
While reading sysctl_[rw]mem_(max|default), they can be changed
concurrently. Thus, we need to add READ_ONCE() to its readers.
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/filter.c')
| -rw-r--r-- | net/core/filter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/filter.c b/net/core/filter.c index e8508aaafd27..c4f14ad82029 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -5034,14 +5034,14 @@ static int __bpf_setsockopt(struct sock *sk, int level, int optname, /* Only some socketops are supported */ switch (optname) { case SO_RCVBUF: - val = min_t(u32, val, sysctl_rmem_max); + val = min_t(u32, val, READ_ONCE(sysctl_rmem_max)); val = min_t(int, val, INT_MAX / 2); sk->sk_userlocks |= SOCK_RCVBUF_LOCK; WRITE_ONCE(sk->sk_rcvbuf, max_t(int, val * 2, SOCK_MIN_RCVBUF)); break; case SO_SNDBUF: - val = min_t(u32, val, sysctl_wmem_max); + val = min_t(u32, val, READ_ONCE(sysctl_wmem_max)); val = min_t(int, val, INT_MAX / 2); sk->sk_userlocks |= SOCK_SNDBUF_LOCK; WRITE_ONCE(sk->sk_sndbuf, |