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 6D42CC282CB for ; Mon, 28 Jan 2019 07:11:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2C15D20881 for ; Mon, 28 Jan 2019 07:11:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HceWosaB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727058AbfA1HL0 (ORCPT ); Mon, 28 Jan 2019 02:11:26 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:34118 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727050AbfA1HLZ (ORCPT ); Mon, 28 Jan 2019 02:11:25 -0500 Received: by mail-pl1-f193.google.com with SMTP id w4so7369772plz.1; Sun, 27 Jan 2019 23:11:24 -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=2eXLt0KQPryB4KEyT0Hne8nPJQyV5gcWgnhn87RHVQA=; b=HceWosaBN7AfQuEpVSImwkYvnC4ZmjYyC83SMsu71hMaM3s00it3NcmsBhCZ4AgTNT sLztJc0ULFBA8Mc00nuyue59w9HoeUu1PcDZzVYF+N66CeNKOK4fDk7H4axpik3ZnCpS JWW8xH3JlSBo87ULQRAtDvfJc+s9nzdNc5sQUFqOjhuJ/oyekFutnubfTRB+Yf3qDN8E uG++YcXpZsimaojk2mBKfDXdcOIdxpg7TmCSgta0BfRaqg4lPZ8wV8TJSimKdhH5J+L9 HBJ8WMOFxLFyGEAwZSJYB3NMxXg59ZENd8Wl2gEgZ4PRe6uQxtuhSK7f/3+n+cNlrv9g /ZyA== 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=2eXLt0KQPryB4KEyT0Hne8nPJQyV5gcWgnhn87RHVQA=; b=IMucyX7jIM35x0PimMbyBObhvTx1gXTLbXqQKY7S5TYR0ZJ7/ziPrEEhWdYjC+PpwR 9ScBrUD4UbR+jV7/xCIPkmXNLjiW/a4i3r02D7PASgTU9olU2SCOhkd6qgQdaHLa8zMX r/oEY72NzsW29B6pS9E9HyzuvaCQOf508rslVh+JMzKDu4Y41uuy+vp8S6aUSbLA7ZeZ gjjndsI4YC1HR18wQAtwj0UfAYfPaM8J2d2QXolxrPNAL2x59D9S2ShOAUpxF85rYxu4 QKWsBIQvpIrT3In/6Um3s+tVgdhoIpjOujQNcNzXU2AKFsw439qxYju9T/CsJRMhpFzl oltg== X-Gm-Message-State: AJcUukdcVxGaKzbpOt57xmjJ10tgkGYNstfQTuNJ8dJFK/6bMyQhRBhM EUlW56n+IYFZBeoxaGu8ZqO8AVsRqn8= X-Google-Smtp-Source: ALg8bN5atWGIjI61C3D0S7NGAgKEpukwX/UaItqXlEQ383Jxi9gNaEeBQJ3W1r5okR7aCmqsy7VnTw== X-Received: by 2002:a17:902:70c6:: with SMTP id l6mr14651751plt.30.1548659484375; Sun, 27 Jan 2019 23:11:24 -0800 (PST) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id z127sm58993186pfb.80.2019.01.27.23.11.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Jan 2019 23:11:23 -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 21/24] sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_DEFAULT_PRINFO sockopt Date: Mon, 28 Jan 2019 15:08:43 +0800 Message-Id: <3ec8b9a5111b19fc30d5f6acfdad7cdb771dc04c.1548659198.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <439c70f52f7a642875ab45b7103f586bd09785d2.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> <33a798e9b29f2dcbe6dd132cb801b4960d1411a5.1548659198.git.lucien.xin@gmail.com> <5d9d0bf635fb89cc3933b256e5e41dd3958c61d6.1548659198.git.lucien.xin@gmail.com> <4a601f978a5364fb8f5c4ee97e314eb28087917f.1548659198.git.lucien.xin@gmail.com> <1788c2da8ddb39854267ea1321d725635a7c983e.1548659198.git.lucien.xin@gmail.com> <70a401b7942eae75d2834dcbefe242f5eb4ad28d.1548659198.git.lucien.xin@gmail.com> <8cc9dcf9afe96c746c525943dd95d51a804f0126.1548659198.git.lucien.xin@gmail.com> <439c70f52f7a642875ab45b7103f586bd09785d2.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_ALL_ASSOC instead in sctp_setsockopt_default_prinfo and check with SCTP_FUTURE_ASSOC instead in sctp_getsockopt_default_prinfo, it's compatible with 0. SCTP_CURRENT_ASSOC is supported for SCTP_DEFAULT_PRINFO in this patch. Signed-off-by: Xin Long --- net/sctp/socket.c | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 3a954ac..2f70171 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -4136,6 +4136,7 @@ static int sctp_setsockopt_default_prinfo(struct sock *sk, char __user *optval, unsigned int optlen) { + struct sctp_sock *sp = sctp_sk(sk); struct sctp_default_prinfo info; struct sctp_association *asoc; int retval = -EINVAL; @@ -4155,19 +4156,31 @@ static int sctp_setsockopt_default_prinfo(struct sock *sk, info.pr_value = 0; asoc = sctp_id2assoc(sk, info.pr_assoc_id); + if (!asoc && info.pr_assoc_id > SCTP_ALL_ASSOC && + sctp_style(sk, UDP)) + goto out; + + retval = 0; + if (asoc) { SCTP_PR_SET_POLICY(asoc->default_flags, info.pr_policy); asoc->default_timetolive = info.pr_value; - } else if (!info.pr_assoc_id) { - struct sctp_sock *sp = sctp_sk(sk); + goto out; + } + if (info.pr_assoc_id == SCTP_FUTURE_ASSOC || + info.pr_assoc_id == SCTP_ALL_ASSOC) { SCTP_PR_SET_POLICY(sp->default_flags, info.pr_policy); sp->default_timetolive = info.pr_value; - } else { - goto out; } - retval = 0; + if (info.pr_assoc_id == SCTP_CURRENT_ASSOC || + info.pr_assoc_id == SCTP_ALL_ASSOC) { + list_for_each_entry(asoc, &sp->ep->asocs, asocs) { + SCTP_PR_SET_POLICY(asoc->default_flags, info.pr_policy); + asoc->default_timetolive = info.pr_value; + } + } out: return retval; @@ -7288,17 +7301,20 @@ static int sctp_getsockopt_default_prinfo(struct sock *sk, int len, goto out; asoc = sctp_id2assoc(sk, info.pr_assoc_id); + if (!asoc && info.pr_assoc_id != SCTP_FUTURE_ASSOC && + sctp_style(sk, UDP)) { + retval = -EINVAL; + goto out; + } + if (asoc) { info.pr_policy = SCTP_PR_POLICY(asoc->default_flags); info.pr_value = asoc->default_timetolive; - } else if (!info.pr_assoc_id) { + } else { struct sctp_sock *sp = sctp_sk(sk); info.pr_policy = SCTP_PR_POLICY(sp->default_flags); info.pr_value = sp->default_timetolive; - } else { - retval = -EINVAL; - goto out; } if (put_user(len, optlen)) -- 2.1.0