From patchwork Wed Apr 17 09:18:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaohe Lin X-Patchwork-Id: 1086871 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=huawei.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44kc9c0hDMz9s71 for ; Wed, 17 Apr 2019 19:18:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731538AbfDQJSf (ORCPT ); Wed, 17 Apr 2019 05:18:35 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:6755 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727087AbfDQJSf (ORCPT ); Wed, 17 Apr 2019 05:18:35 -0400 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 101631DEAD168EB86EA5; Wed, 17 Apr 2019 17:18:33 +0800 (CST) Received: from [127.0.0.1] (10.184.189.20) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.408.0; Wed, 17 Apr 2019 17:18:26 +0800 To: , , , , , , , , , , , From: linmiaohe Subject: [PATCH] ipvs:set sock send/receive buffer correctly CC: Mingfangsen , , Message-ID: <501e5522-1d69-7c67-a1bc-fd8502d3b5d1@huawei.com> Date: Wed, 17 Apr 2019 17:18:17 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 Content-Language: en-US X-Originating-IP: [10.184.189.20] X-CFilter-Loop: Reflected Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jie Liu If we set sysctl_wmem_max or sysctl_rmem_max larger than INT_MAX, the send/receive buffer of sock will be an negative value. Same as when the val is larger than INT_MAX/2. Fixes: 1c003b1580e2 ("ipvs: wakeup master thread") Reported-by: Qiang Ning Reviewed-by: Miaohe Lin Signed-off-by: Jie Liu --- net/netfilter/ipvs/ip_vs_sync.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c index 2526be6b3d90..c0e4cbed6e74 100644 --- a/net/netfilter/ipvs/ip_vs_sync.c +++ b/net/netfilter/ipvs/ip_vs_sync.c @@ -1278,14 +1278,12 @@ static void set_sock_size(struct sock *sk, int mode, int val) /* setsockopt(sock, SOL_SOCKET, SO_RCVBUF, &val, sizeof(val)); */ lock_sock(sk); if (mode) { - val = clamp_t(int, val, (SOCK_MIN_SNDBUF + 1) / 2, - sysctl_wmem_max); - sk->sk_sndbuf = val * 2; + val = min_t(u32, val, sysctl_wmem_max); + sk->sk_sndbuf = max_t(int, val * 2, SOCK_MIN_SNDBUF); sk->sk_userlocks |= SOCK_SNDBUF_LOCK; } else { - val = clamp_t(int, val, (SOCK_MIN_RCVBUF + 1) / 2, - sysctl_rmem_max); - sk->sk_rcvbuf = val * 2; + val = min_t(u32, val, sysctl_rmem_max); + sk->sk_rcvbuf = max_t(int, val * 2, SOCK_MIN_RCVBUF); sk->sk_userlocks |= SOCK_RCVBUF_LOCK; } release_sock(sk);