From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 749CCC2D0DB for ; Fri, 24 Jan 2020 09:55:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4951322522 for ; Fri, 24 Jan 2020 09:55:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859734; bh=rO20ReY0D17Z08+D6hDKugrRpVERf/wymJFyg4vn6yo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tjqx7Xqp/Ye8XbZavtjTQ8eQBghEW5YNYrSOd9nqrs8b17MldwFIeFyxYKPS6lHI3 sL9BgQcaBuSvY4anAqcSmfFfLX825iOXId0ktPgTdpiSs2GXuLu39CrXpma+swgrk1 oCqorjLa8d2G5GxSzL90ZkNfAG81/l5Co29t/3p4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388374AbgAXJyc (ORCPT ); Fri, 24 Jan 2020 04:54:32 -0500 Received: from mail.kernel.org ([198.145.29.99]:57598 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731584AbgAXJyc (ORCPT ); Fri, 24 Jan 2020 04:54:32 -0500 Received: from localhost (unknown [145.15.244.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BD0F620709; Fri, 24 Jan 2020 09:54:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859671; bh=rO20ReY0D17Z08+D6hDKugrRpVERf/wymJFyg4vn6yo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tlqwVO9EaC0s1RpRf0Ne0zEy1IWSPc3Qp8K2tQZMF9y2r4OUPOjs5RERjwdNDk9Ke ho8rqVUSJrm/kobLZ6K7MHp4eeVkzWAea66kd7anGD6HxZHHQtMNmxrlJJDJYuKfpN uBj12tbB2Qs9zVR64pP64fAAM23fQl4BmyJ+y33E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jie Liu , Qiang Ning , Zhiqiang Liu , Miaohe Lin , "David S. Miller" , Sasha Levin Subject: [PATCH 4.14 170/343] tipc: set sysctl_tipc_rmem and named_timeout right range Date: Fri, 24 Jan 2020 10:29:48 +0100 Message-Id: <20200124092942.358845182@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jie Liu [ Upstream commit 4bcd4ec1017205644a2697bccbc3b5143f522f5f ] We find that sysctl_tipc_rmem and named_timeout do not have the right minimum setting. sysctl_tipc_rmem should be larger than zero, like sysctl_tcp_rmem. And named_timeout as a timeout setting should be not less than zero. Fixes: cc79dd1ba9c10 ("tipc: change socket buffer overflow control to respect sk_rcvbuf") Fixes: a5325ae5b8bff ("tipc: add name distributor resiliency queue") Signed-off-by: Jie Liu Reported-by: Qiang Ning Reviewed-by: Zhiqiang Liu Reviewed-by: Miaohe Lin Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/tipc/sysctl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net/tipc/sysctl.c b/net/tipc/sysctl.c index 1a779b1e85100..40f6d82083d7b 100644 --- a/net/tipc/sysctl.c +++ b/net/tipc/sysctl.c @@ -37,6 +37,8 @@ #include +static int zero; +static int one = 1; static struct ctl_table_header *tipc_ctl_hdr; static struct ctl_table tipc_table[] = { @@ -45,14 +47,16 @@ static struct ctl_table tipc_table[] = { .data = &sysctl_tipc_rmem, .maxlen = sizeof(sysctl_tipc_rmem), .mode = 0644, - .proc_handler = proc_dointvec, + .proc_handler = proc_dointvec_minmax, + .extra1 = &one, }, { .procname = "named_timeout", .data = &sysctl_tipc_named_timeout, .maxlen = sizeof(sysctl_tipc_named_timeout), .mode = 0644, - .proc_handler = proc_dointvec, + .proc_handler = proc_dointvec_minmax, + .extra1 = &zero, }, {} }; -- 2.20.1