[net,v3,1/1] net: tcp: Permit user set TCP_MAXSEG to default value

Submitted by 高峰 on March 21, 2017, 1:28 a.m.

Details

Message ID 1490059683-13884-1-git-send-email-fgao@ikuai8.com
State Accepted
Delegated to: David Miller
Headers show

Commit Message

高峰 March 21, 2017, 1:28 a.m.
From: Gao Feng <fgao@ikuai8.com>

When user_mss is zero, it means use the default value. But the current
codes don't permit user set TCP_MAXSEG to the default value.
It would return the -EINVAL when val is zero.

Signed-off-by: Gao Feng <fgao@ikuai8.com>
---
 v3: Correct the logic error, per Neal
 v2: Make codes more clearer, per Eric
 v1: initial version

 net/ipv4/tcp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

David Miller March 22, 2017, 6:48 p.m.
From: fgao@ikuai8.com
Date: Tue, 21 Mar 2017 09:28:03 +0800

> From: Gao Feng <fgao@ikuai8.com>
> 
> When user_mss is zero, it means use the default value. But the current
> codes don't permit user set TCP_MAXSEG to the default value.
> It would return the -EINVAL when val is zero.
> 
> Signed-off-by: Gao Feng <fgao@ikuai8.com>
> ---
>  v3: Correct the logic error, per Neal
>  v2: Make codes more clearer, per Eric
>  v1: initial version

Applied to net-next, thanks.

Patch hide | download patch | download mbox

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 1e319a5..4f7f163 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2470,7 +2470,7 @@  static int do_tcp_setsockopt(struct sock *sk, int level,
 		/* Values greater than interface MTU won't take effect. However
 		 * at the point when this call is done we typically don't yet
 		 * know which interface is going to be used */
-		if (val < TCP_MIN_MSS || val > MAX_TCP_WINDOW) {
+		if (val && (val < TCP_MIN_MSS || val > MAX_TCP_WINDOW)) {
 			err = -EINVAL;
 			break;
 		}