Skip to content

Commit 7712581

Browse files
edumazetgregkh
authored andcommitted
net: avoid signed overflows for SO_{SND|RCV}BUFFORCE
[ Upstream commit b98b0bc8c431e3ceb4b26b0dfc8db509518fb290 ] 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 8298193 ("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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 6e682c5 commit 7712581

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

net/core/sock.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
745745
val = min_t(u32, val, sysctl_wmem_max);
746746
set_sndbuf:
747747
sk->sk_userlocks |= SOCK_SNDBUF_LOCK;
748-
sk->sk_sndbuf = max_t(u32, val * 2, SOCK_MIN_SNDBUF);
748+
sk->sk_sndbuf = max_t(int, val * 2, SOCK_MIN_SNDBUF);
749749
/* Wake up sending tasks if we upped the value. */
750750
sk->sk_write_space(sk);
751751
break;
@@ -781,7 +781,7 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
781781
* returning the value we actually used in getsockopt
782782
* is the most desirable behavior.
783783
*/
784-
sk->sk_rcvbuf = max_t(u32, val * 2, SOCK_MIN_RCVBUF);
784+
sk->sk_rcvbuf = max_t(int, val * 2, SOCK_MIN_RCVBUF);
785785
break;
786786

787787
case SO_RCVBUFFORCE:

0 commit comments

Comments
 (0)