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 D3136C282C8 for ; Mon, 28 Jan 2019 07:09:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A48A321736 for ; Mon, 28 Jan 2019 07:09:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="F/rCKage" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726947AbfA1HJz (ORCPT ); Mon, 28 Jan 2019 02:09:55 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:41652 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726765AbfA1HJy (ORCPT ); Mon, 28 Jan 2019 02:09:54 -0500 Received: by mail-pf1-f196.google.com with SMTP id b7so7593721pfi.8; Sun, 27 Jan 2019 23:09:54 -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=Tp/H7DJCTt1WkYMIEZqjoyie734ShuxCHUhdVMAl2ac=; b=F/rCKageee5LrCjDqvvcynuuZxU24DfKgHj6lq7jNDqxoPgCy+PBfSZE3NjLo925wH ZyOd+E+0Y8FfX7V1IP6Tl0XIBTr5Wzr+uLxLKyOSStDk6rOfN2RnusWkqaMHfSZ+YgnZ Wyx7JW2ksO7uAVBW6loyjPeSfKoU2NA39vy7G3qJrFMJwvEYoctxydzpajfgXqTf+23X kpkesk9G0cfnoSCcuaVKk+dCzkhKHBnVVqJsqpwMveEs7+MU3QqXWn29vGX/g73oZFA0 w1C7r8gs2jdBiO+bDQNDAUm3N4A0JQl/hPvvF3WWHj04B4UbuQhfYaPu7OQVU/B7v0c4 Kjpw== 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=Tp/H7DJCTt1WkYMIEZqjoyie734ShuxCHUhdVMAl2ac=; b=VxKo462gVnRQ8jntAi9xfd/awIZXQwtQHGYLcQMe1ro6wfBdzPYd7S1X3444+O6s/4 Wq2fwqTY6Bs0+Pr1i6nZC4WpikU98aRnVD+As9EjPm7uS0fogYv2NGUXQw7YzDDB9zAC qk4jHjSKvs11IbOIy7I5/pwNo/XYjMnzHYByMUYWcyewI6XEmKp2Get8+5gK49Q1a3RU hH/ZhRa8RKt6VXqlL8us8QkdoHmg55hZ1+EyyJ+66LB7tqMdE8PhgSHGthpySAcmjrzu 43TJsfv3eM7egruFkiYBAFVtqBGwvXY3fy32L/oyocoWQH+XZXFwXbHIy25e1bSuy8ar dDiQ== X-Gm-Message-State: AJcUukfSchBA8N6JjXI1Hk7B/NeVs4lqwBpVhMc9BNq4VO3bO6lRb4Tp yj8Ma3Sup6xy8A4/P+kaDNp7Og/HGHk= X-Google-Smtp-Source: ALg8bN6W6VRU8fDakFMYEzvNcEB1ev30g+lvANj7T8Sq7s9cDSYrKp2oo7HrtqyAWoSrMzTSTtKKaQ== X-Received: by 2002:aa7:84d3:: with SMTP id x19mr20744383pfn.220.1548659393900; Sun, 27 Jan 2019 23:09:53 -0800 (PST) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id v5sm63489469pgn.5.2019.01.27.23.09.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Jan 2019 23:09:53 -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 08/24] sctp: use SCTP_FUTURE_ASSOC for SCTP_PR_SUPPORTED sockopt Date: Mon, 28 Jan 2019 15:08:30 +0800 Message-Id: X-Mailer: git-send-email 2.1.0 In-Reply-To: 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> 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_pr_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 | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 1d49b7d..9e2b153 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3965,6 +3965,7 @@ static int sctp_setsockopt_pr_supported(struct sock *sk, unsigned int optlen) { struct sctp_assoc_value params; + struct sctp_association *asoc; if (optlen != sizeof(params)) return -EINVAL; @@ -3972,6 +3973,11 @@ static int sctp_setsockopt_pr_supported(struct sock *sk, if (copy_from_user(¶ms, optval, optlen)) return -EFAULT; + asoc = sctp_id2assoc(sk, params.assoc_id); + if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC && + sctp_style(sk, UDP)) + return -EINVAL; + sctp_sk(sk)->ep->prsctp_enable = !!params.assoc_value; return 0; @@ -7084,17 +7090,15 @@ static int sctp_getsockopt_pr_supported(struct sock *sk, int len, goto out; asoc = sctp_id2assoc(sk, params.assoc_id); - if (asoc) { - params.assoc_value = asoc->prsctp_enable; - } else if (!params.assoc_id) { - struct sctp_sock *sp = sctp_sk(sk); - - params.assoc_value = sp->ep->prsctp_enable; - } else { + if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC && + sctp_style(sk, UDP)) { retval = -EINVAL; goto out; } + params.assoc_value = asoc ? asoc->prsctp_enable + : sctp_sk(sk)->ep->prsctp_enable; + 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:30 +0000 Subject: [PATCH net-next 08/24] sctp: use SCTP_FUTURE_ASSOC for SCTP_PR_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> In-Reply-To: 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_pr_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 | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 1d49b7d..9e2b153 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3965,6 +3965,7 @@ static int sctp_setsockopt_pr_supported(struct sock *sk, unsigned int optlen) { struct sctp_assoc_value params; + struct sctp_association *asoc; if (optlen != sizeof(params)) return -EINVAL; @@ -3972,6 +3973,11 @@ static int sctp_setsockopt_pr_supported(struct sock *sk, if (copy_from_user(¶ms, optval, optlen)) return -EFAULT; + asoc = sctp_id2assoc(sk, params.assoc_id); + if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC && + sctp_style(sk, UDP)) + return -EINVAL; + sctp_sk(sk)->ep->prsctp_enable = !!params.assoc_value; return 0; @@ -7084,17 +7090,15 @@ static int sctp_getsockopt_pr_supported(struct sock *sk, int len, goto out; asoc = sctp_id2assoc(sk, params.assoc_id); - if (asoc) { - params.assoc_value = asoc->prsctp_enable; - } else if (!params.assoc_id) { - struct sctp_sock *sp = sctp_sk(sk); - - params.assoc_value = sp->ep->prsctp_enable; - } else { + if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC && + sctp_style(sk, UDP)) { retval = -EINVAL; goto out; } + params.assoc_value = asoc ? asoc->prsctp_enable + : sctp_sk(sk)->ep->prsctp_enable; + if (put_user(len, optlen)) goto out; -- 2.1.0