[PATCH net 1/1] net: sock: Use double send/recv buff value to compare with max value
From: <hidden>
Date: 2017-02-08 13:17:14
Subsystem:
networking [general], networking [sockets], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Kuniyuki Iwashima, Willem de Bruijn, Linus Torvalds
From: Gao Feng <redacted> Because the value of SO_SNDBUF and SO_RCVBUF is doubled before assignment, so the real value of send and recv buffer could be more than the max sysctl config sysctl_wmem_max and sysctl_rmem_max. Now use doulbe send/recv buffer value to compare with sysctl_wmem_max and sysctl_rmem_max, and it keeps consistence with SOCK_MIN_SNDBUF and SOCK_MIN_RCVBUF. Signed-off-by: Gao Feng <redacted> --- net/core/sock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/core/sock.c b/net/core/sock.c
index 4eca27d..fa40dff 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c@@ -712,7 +712,7 @@ int sock_setsockopt(struct socket *sock, int level, int optname, * play 'guess the biggest size' games. RCVBUF/SNDBUF * are treated in BSD as hints */ - val = min_t(u32, val, sysctl_wmem_max); + val = min_t(u32, val * 2, sysctl_wmem_max); set_sndbuf: sk->sk_userlocks |= SOCK_SNDBUF_LOCK; sk->sk_sndbuf = max_t(int, val * 2, SOCK_MIN_SNDBUF);
@@ -733,7 +733,7 @@ int sock_setsockopt(struct socket *sock, int level, int optname, * play 'guess the biggest size' games. RCVBUF/SNDBUF * are treated in BSD as hints */ - val = min_t(u32, val, sysctl_rmem_max); + val = min_t(u32, val * 2, sysctl_rmem_max); set_rcvbuf: sk->sk_userlocks |= SOCK_RCVBUF_LOCK; /*
--
1.9.1