From patchwork Mon Mar 20 21:30:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?6auY5bOw?= X-Patchwork-Id: 741217 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vn8K43NFyz9s06 for ; Tue, 21 Mar 2017 08:31:36 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756155AbdCTVbe (ORCPT ); Mon, 20 Mar 2017 17:31:34 -0400 Received: from smtpbg291.qq.com ([113.108.11.223]:43787 "EHLO smtpbg291.qq.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755919AbdCTVbd (ORCPT ); Mon, 20 Mar 2017 17:31:33 -0400 X-QQ-mid: bizesmtp7t1490045427teq2gjzhf Received: from ikuai-dev.ikuai8.com (unknown [123.56.230.35]) by esmtp4.qq.com (ESMTP) with id ; Tue, 21 Mar 2017 05:30:18 +0800 (CST) X-QQ-SSF: 01400000002000F0FI40B00A0000000 X-QQ-FEAT: Me8Xob1wlXJnf0GDKQbVdxtn7akpipq0npK4upuZsZ6gwPmY/KzUdnNuukqvr pUSae6inOSfQdbdFw+dWDmuanq7gi6mF4zmPP8pVya0j6JfZ8kQPQEzqxb70hPivV+pagzu ey8I28B/LRoS+yxRlaxayYqjRXMrP0pquHYO82ms4y/rin9OYlBxpyjzoIkEBFb8EiRTqd+ +YoiNXdHE51RhrIujDDISkTh1I8xzP1PoLXAEck2OjKdIciQSGE07tre065tSLBaACQ4gaP IPAA== X-QQ-GoodBg: 2 From: fgao@ikuai8.com To: davem@davemloft.net, kuznet@ms2.inr.ac.ru, jmorris@namei.org, netdev@vger.kernel.org, gfree.wind@gmail.com Cc: Gao Feng Subject: [PATCH net 1/1] net: tcp: Permit user set TCP_MAXSEG to default value Date: Tue, 21 Mar 2017 05:30:17 +0800 Message-Id: <1490045417-32412-1-git-send-email-fgao@ikuai8.com> X-Mailer: git-send-email 1.9.1 X-QQ-SENDSIZE: 520 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Gao Feng 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 --- net/ipv4/tcp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 1e319a5..dd5e8e2 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2470,7 +2470,8 @@ 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 < 0 || (val > 0 && val < TCP_MIN_MSS) || + val > MAX_TCP_WINDOW) { err = -EINVAL; break; }