diff options
author | Eric Dumazet <edumazet@google.com> | 2016-12-02 12:44:53 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-12-02 14:10:14 -0500 |
commit | b98b0bc8c431e3ceb4b26b0dfc8db509518fb290 (patch) | |
tree | 1df6d58e0f2c836a2808658830a3425e169645e6 /net | |
parent | 5b01014759991887b1e450c9def01e58c02ab81b (diff) |
net: avoid signed overflows for SO_{SND|RCV}BUFFORCE
CAP_NET_ADMIN users should not be allowed to set negative
sk_sndbuf or sk_rcvbuf values, as it can lead to various memory
corruptions, crashes, OOM...
Note that before commit 82981930125a ("net: cleanups in
sock_setsockopt()"), the bug was even more serious, since SO_SNDBUF
and SO_RCVBUF were vulnerable.
This needs to be backported to all known linux kernels.
Again, many thanks to syzkaller team for discovering this gem.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/core/sock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 5e3ca414357e..00a074dbfe9b 100644 --- a/net/core/sock.c +++ b/net/core/sock.c | |||
@@ -715,7 +715,7 @@ int sock_setsockopt(struct socket *sock, int level, int optname, | |||
715 | val = min_t(u32, val, sysctl_wmem_max); | 715 | val = min_t(u32, val, sysctl_wmem_max); |
716 | set_sndbuf: | 716 | set_sndbuf: |
717 | sk->sk_userlocks |= SOCK_SNDBUF_LOCK; | 717 | sk->sk_userlocks |= SOCK_SNDBUF_LOCK; |
718 | sk->sk_sndbuf = max_t(u32, val * 2, SOCK_MIN_SNDBUF); | 718 | sk->sk_sndbuf = max_t(int, val * 2, SOCK_MIN_SNDBUF); |
719 | /* Wake up sending tasks if we upped the value. */ | 719 | /* Wake up sending tasks if we upped the value. */ |
720 | sk->sk_write_space(sk); | 720 | sk->sk_write_space(sk); |
721 | break; | 721 | break; |
@@ -751,7 +751,7 @@ set_rcvbuf: | |||
751 | * returning the value we actually used in getsockopt | 751 | * returning the value we actually used in getsockopt |
752 | * is the most desirable behavior. | 752 | * is the most desirable behavior. |
753 | */ | 753 | */ |
754 | sk->sk_rcvbuf = max_t(u32, val * 2, SOCK_MIN_RCVBUF); | 754 | sk->sk_rcvbuf = max_t(int, val * 2, SOCK_MIN_RCVBUF); |
755 | break; | 755 | break; |
756 | 756 | ||
757 | case SO_RCVBUFFORCE: | 757 | case SO_RCVBUFFORCE: |