From patchwork Wed Dec 14 21:48:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xi Wang X-Patchwork-Id: 131481 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 99CD81007D6 for ; Thu, 15 Dec 2011 08:48:48 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758102Ab1LNVsn (ORCPT ); Wed, 14 Dec 2011 16:48:43 -0500 Received: from mail-fx0-f46.google.com ([209.85.161.46]:42355 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755372Ab1LNVsl (ORCPT ); Wed, 14 Dec 2011 16:48:41 -0500 Received: by faar15 with SMTP id r15so1731369faa.19 for ; Wed, 14 Dec 2011 13:48:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=XoPENaViveNdnyN0nn5syroboTPyFRb7ExWSmEm13QU=; b=LOWIgNt1PPshKiscyFpoVwRc4YaD7TDmak/E6GswopsrJ+XnVchscPEtoK/iRrnWfe AyRuSXR8J/26R+DeuXaX3Mi9HreHd2KP3b5Qpyy+BkXbGnO3rWy+bS+mzoFWh+jlMCXX 3YCxk0SmoU32hHnktlRFbXpWFsqcViyBP3kaQ= Received: by 10.180.14.5 with SMTP id l5mr670326wic.44.1323899320509; Wed, 14 Dec 2011 13:48:40 -0800 (PST) Received: from vpn-18-101-16-151.mit.edu (VPN-18-101-16-151.MIT.EDU. [18.101.16.151]) by mx.google.com with ESMTPS id er5sm6051823wbb.11.2011.12.14.13.48.38 (version=SSLv3 cipher=OTHER); Wed, 14 Dec 2011 13:48:40 -0800 (PST) Message-ID: <4EE919B5.3090901@gmail.com> Date: Wed, 14 Dec 2011 16:48:37 -0500 From: Xi Wang User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:8.0) Gecko/20111105 Thunderbird/8.0 MIME-Version: 1.0 To: netdev@vger.kernel.org CC: linux-sctp@vger.kernel.org, Andrew Morton , Andrei Pelinescu-Onciul , Vlad Yasevich , "David S. Miller" Subject: [PATCH v2] sctp: fix incorrect overflow check on autoclose References: <1323393883-3759-1-git-send-email-xi.wang@gmail.com> In-Reply-To: <1323393883-3759-1-git-send-email-xi.wang@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit 8ffd3208 voids the previous patches f6778aab and 810c0719 for limiting the maximum autoclose value. If userspace passes in -1 on 32-bit platform, the overflow check didn't work and autoclose would be set to 0xffffffff. This patch defines a max_autoclose for limiting the value and exposes it through sysctl. Suggested-by: Vlad Yasevich Signed-off-by: Xi Wang --- include/net/sctp/structs.h | 4 ++++ net/sctp/protocol.c | 3 +++ net/sctp/socket.c | 4 ++-- net/sctp/sysctl.c | 7 +++++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h index e90e7a9..781f16d 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h @@ -241,6 +241,9 @@ extern struct sctp_globals { * bits is an indicator of when to send and window update SACK. */ int rwnd_update_shift; + + /* Threshold for autoclose timeout. */ + unsigned int max_autoclose; } sctp_globals; #define sctp_rto_initial (sctp_globals.rto_initial) @@ -281,6 +284,7 @@ extern struct sctp_globals { #define sctp_auth_enable (sctp_globals.auth_enable) #define sctp_checksum_disable (sctp_globals.checksum_disable) #define sctp_rwnd_upd_shift (sctp_globals.rwnd_update_shift) +#define sctp_max_autoclose (sctp_globals.max_autoclose) /* SCTP Socket type: UDP or TCP style. */ typedef enum { diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index 61b9fca..4e07b18 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c @@ -1285,6 +1285,9 @@ SCTP_STATIC __init int sctp_init(void) sctp_max_instreams = SCTP_DEFAULT_INSTREAMS; sctp_max_outstreams = SCTP_DEFAULT_OUTSTREAMS; + /* Initialize maximum autoclose timeout. */ + sctp_max_autoclose = INT_MAX; + /* Initialize handle used for association ids. */ idr_init(&sctp_assocs_id); diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 13bf5fc..f8c8e66 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -2200,8 +2200,8 @@ static int sctp_setsockopt_autoclose(struct sock *sk, char __user *optval, return -EINVAL; if (copy_from_user(&sp->autoclose, optval, optlen)) return -EFAULT; - /* make sure it won't exceed MAX_SCHEDULE_TIMEOUT */ - sp->autoclose = min_t(long, sp->autoclose, MAX_SCHEDULE_TIMEOUT / HZ); + /* make sure it won't exceed sctp_max_autoclose / HZ */ + sp->autoclose = min(sp->autoclose, sctp_max_autoclose / HZ); return 0; } diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c index 6b39529..b74686e 100644 --- a/net/sctp/sysctl.c +++ b/net/sctp/sysctl.c @@ -258,6 +258,13 @@ static ctl_table sctp_table[] = { .extra1 = &one, .extra2 = &rwnd_scale_max, }, + { + .procname = "max_autoclose", + .data = &sctp_max_autoclose, + .maxlen = sizeof(unsigned int), + .mode = 0644, + .proc_handler = &proc_dointvec_jiffies, + }, { /* sentinel */ } };