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.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham 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 01689C282C8 for ; Mon, 28 Jan 2019 07:10:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BF17620881 for ; Mon, 28 Jan 2019 07:10:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EDlJ1tHP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726950AbfA1HKH (ORCPT ); Mon, 28 Jan 2019 02:10:07 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:34592 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726626AbfA1HKH (ORCPT ); Mon, 28 Jan 2019 02:10:07 -0500 Received: by mail-pg1-f196.google.com with SMTP id j10so6855375pga.1; Sun, 27 Jan 2019 23:10:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=UbkYqbpZZvA70jXHzV0IOmkrBbD4jXouRbcHITZqVXI=; b=EDlJ1tHP5fVw9ZH/c2q5sbZbPJZq+JbjE/mBEkcPOwOzXin/X8vqli3FX4lnBhyU1g FqcYunjYG5XaLr/lGulPa03jLdx3Ho9jeQTPll7jRDn5p5h9lZ2RdB+Zcz1twOMb/1ig iAVWOofw7Ymeh1NW/uMwPy5RyvkjnGGuot0JzzWEdsf9qjAzHM537TkmE3xGyZ2ChFBW wVTYQ5RL/yxbMT/6lCrt/Tl177Qg92E61sDY7XaQMJg5xpvbVfccHjim1kwGspMA66AC AsvJeetSzC/0AEJHka2H1hTmQmuTyhxzGXyJesLQApXiUL+s46aC6kpH/JBJawWGxuZn HDzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=UbkYqbpZZvA70jXHzV0IOmkrBbD4jXouRbcHITZqVXI=; b=sH/Bym/KfExMOYAoPX4NkwF1M0I81SU2azqFQ4hLQMcYPNMVjjbuXHG0GT9q8+4wFS f7NNwgIJ8s+jBBpfgjHmWMNZUPM3M3E+8biKQh0Tp8NF80EnMpbvy7K4idl7qXyIvHzh X2N/PgGU6aUbwnpdcD/oUmo8TKEcSfzFpcYh1I3HhWd0Ri1CuLUW77jQsNMc1C3NnDbe oVw3NKFq0pp83BZ47J4t3hYgvLNOsxiCi+i6IIet8LBrHn/TXj3WA6kpK2xS11Q4CB0S aroqb9t7pSdA14h8y6498/UkqEuqXOiriXjbShv5E5bp09WGPfhNfj+XQWCOUmlFPRHp wUpA== X-Gm-Message-State: AJcUukcSKxkk/j29uQBxKRaGgAKG3GPtKGG1jMmyzyyoMuTbIuXHCL7G PHQGBq3pESBsqTci09KmtVmDP4sOVtw= X-Google-Smtp-Source: ALg8bN6V9ck5EmkvuQ3LxB3Tu6XdW8CvQuHw2NFXYFD8yoiG1nMrwLjU9PdwobVc70OExQsWc8sGnw== X-Received: by 2002:a62:184e:: with SMTP id 75mr20498797pfy.28.1548659405770; Sun, 27 Jan 2019 23:10:05 -0800 (PST) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id f62sm53120912pgc.67.2019.01.27.23.10.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Jan 2019 23:10:05 -0800 (PST) From: Xin Long To: network dev , linux-sctp@vger.kernel.org Cc: Marcelo Ricardo Leitner , Neil Horman , davem@davemloft.net Subject: [PATCH net-next 10/24] sctp: use SCTP_FUTURE_ASSOC for SCTP_INTERLEAVING_SUPPORTED sockopt Date: Mon, 28 Jan 2019 15:08:32 +0800 Message-Id: X-Mailer: git-send-email 2.1.0 In-Reply-To: <17140f5cc5fc1961e3e7cf74888affd55e0e6c06.1548659198.git.lucien.xin@gmail.com> References: <3ca66b981a0fe9368bd976676fe7450634b091cd.1548659198.git.lucien.xin@gmail.com> <16e83f8259873a6818863586e6a3fcb1e2e3717b.1548659198.git.lucien.xin@gmail.com> <088bc37947694e4e80302b075f767a7828ea4a05.1548659198.git.lucien.xin@gmail.com> <285500315e06236e468142d80c6557eae4898b36.1548659198.git.lucien.xin@gmail.com> <17140f5cc5fc1961e3e7cf74888affd55e0e6c06.1548659198.git.lucien.xin@gmail.com> In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Check with SCTP_FUTURE_ASSOC instead in sctp_set/getsockopt_reconfig_supported, it's compatible with 0. It also adjusts some code to keep a same check form as other functions. Signed-off-by: Xin Long --- net/sctp/socket.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index e5487a1..b9263ad 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -4240,8 +4240,8 @@ static int sctp_setsockopt_interleaving_supported(struct sock *sk, unsigned int optlen) { struct sctp_sock *sp = sctp_sk(sk); - struct net *net = sock_net(sk); struct sctp_assoc_value params; + struct sctp_association *asoc; int retval = -EINVAL; if (optlen < sizeof(params)) @@ -4253,10 +4253,12 @@ static int sctp_setsockopt_interleaving_supported(struct sock *sk, goto out; } - if (params.assoc_id) + asoc = sctp_id2assoc(sk, params.assoc_id); + if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC && + sctp_style(sk, UDP)) goto out; - if (!net->sctp.intl_enable || !sp->frag_interleave) { + if (!sock_net(sk)->sctp.intl_enable || !sp->frag_interleave) { retval = -EPERM; goto out; } @@ -7453,17 +7455,15 @@ static int sctp_getsockopt_interleaving_supported(struct sock *sk, int len, goto out; asoc = sctp_id2assoc(sk, params.assoc_id); - if (asoc) { - params.assoc_value = asoc->intl_enable; - } else if (!params.assoc_id) { - struct sctp_sock *sp = sctp_sk(sk); - - params.assoc_value = sp->strm_interleave; - } else { + if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC && + sctp_style(sk, UDP)) { retval = -EINVAL; goto out; } + params.assoc_value = asoc ? asoc->intl_enable + : sctp_sk(sk)->strm_interleave; + if (put_user(len, optlen)) goto out; -- 2.1.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Xin Long Date: Mon, 28 Jan 2019 07:08:32 +0000 Subject: [PATCH net-next 10/24] sctp: use SCTP_FUTURE_ASSOC for SCTP_INTERLEAVING_SUPPORTED sockopt Message-Id: List-Id: References: <3ca66b981a0fe9368bd976676fe7450634b091cd.1548659198.git.lucien.xin@gmail.com> <16e83f8259873a6818863586e6a3fcb1e2e3717b.1548659198.git.lucien.xin@gmail.com> <088bc37947694e4e80302b075f767a7828ea4a05.1548659198.git.lucien.xin@gmail.com> <285500315e06236e468142d80c6557eae4898b36.1548659198.git.lucien.xin@gmail.com> <17140f5cc5fc1961e3e7cf74888affd55e0e6c06.1548659198.git.lucien.xin@gmail.com> In-Reply-To: <17140f5cc5fc1961e3e7cf74888affd55e0e6c06.1548659198.git.lucien.xin@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: network dev , linux-sctp@vger.kernel.org Cc: Marcelo Ricardo Leitner , Neil Horman , davem@davemloft.net Check with SCTP_FUTURE_ASSOC instead in sctp_set/getsockopt_reconfig_supported, it's compatible with 0. It also adjusts some code to keep a same check form as other functions. Signed-off-by: Xin Long --- net/sctp/socket.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index e5487a1..b9263ad 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -4240,8 +4240,8 @@ static int sctp_setsockopt_interleaving_supported(struct sock *sk, unsigned int optlen) { struct sctp_sock *sp = sctp_sk(sk); - struct net *net = sock_net(sk); struct sctp_assoc_value params; + struct sctp_association *asoc; int retval = -EINVAL; if (optlen < sizeof(params)) @@ -4253,10 +4253,12 @@ static int sctp_setsockopt_interleaving_supported(struct sock *sk, goto out; } - if (params.assoc_id) + asoc = sctp_id2assoc(sk, params.assoc_id); + if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC && + sctp_style(sk, UDP)) goto out; - if (!net->sctp.intl_enable || !sp->frag_interleave) { + if (!sock_net(sk)->sctp.intl_enable || !sp->frag_interleave) { retval = -EPERM; goto out; } @@ -7453,17 +7455,15 @@ static int sctp_getsockopt_interleaving_supported(struct sock *sk, int len, goto out; asoc = sctp_id2assoc(sk, params.assoc_id); - if (asoc) { - params.assoc_value = asoc->intl_enable; - } else if (!params.assoc_id) { - struct sctp_sock *sp = sctp_sk(sk); - - params.assoc_value = sp->strm_interleave; - } else { + if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC && + sctp_style(sk, UDP)) { retval = -EINVAL; goto out; } + params.assoc_value = asoc ? asoc->intl_enable + : sctp_sk(sk)->strm_interleave; + if (put_user(len, optlen)) goto out; -- 2.1.0