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 251A4C282CB for ; Mon, 28 Jan 2019 07:11:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E97EC20881 for ; Mon, 28 Jan 2019 07:11:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ozfKzju5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726998AbfA1HLC (ORCPT ); Mon, 28 Jan 2019 02:11:02 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:34662 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726672AbfA1HLB (ORCPT ); Mon, 28 Jan 2019 02:11:01 -0500 Received: by mail-pg1-f194.google.com with SMTP id j10so6856536pga.1; Sun, 27 Jan 2019 23:11:00 -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=2bmLkDRnKBlkkLqP++RjwTiOOnkW21wjRFBAKgdOAvU=; b=ozfKzju5gGQ2mBiWCq/TqqxmUwf4+xRtw6OVPVlKjh0ryCefz2BQcmPFH9VIMrz3pw nPQ5ShmuTApS5A9+J+W4kVk9ICOxPeNa+BFT38O/DmKUdVcnmJ2UnZ5SOpEFvg/mu9Mf CHcgdSUSNA89GXokjRgYWH0sTSbtS4Jjd51H5tCfvSBm5bOIO80CfExf9TKGeo/m/JZY A06QhiQJkNrRtCWBlsjd72BXjSdFSdDcFb1l5OiJv7hNLV2ZJIq2tg/MsCyPfT/4V5Ds fDBafQkVLPYGVsZ8iSLFNFssNWlgfVZS+VthHRWznfbkaDNpQgSwN+DT5/V2nTubTD/W aowQ== 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=2bmLkDRnKBlkkLqP++RjwTiOOnkW21wjRFBAKgdOAvU=; b=BzH1zTbmMpgj+uHYuB4LSGa9ndV8AVXxe/FxRqzXvSrQqgNpv4w/vxDEbbcLFM/2cI RqGQG56Mb+l9Xb3+6hxkqhQ+hVZSFMU0Nn+NDkWzxC4OmI/f3Pbr0OH8aOU6/XKyuqIS arHPMmEQ0KM5Mm+YaPsO7xcx73kzVo6ANxUqR/mBlCaS2TY2TA8XG/w6cOA13ztWXFM1 hRNWbGCnb2lqM8c6WV2jUYlUOPQlK7metO3PL3Z52gcY7t74PvbMEPqxjSG0Kq/YRdi1 aro7AgY4ALOArg38OL9GG1DT7BqNvHgIDPBDeD5KctGQNVNlb1SAS/kTphzwxs13hXGT K1/Q== X-Gm-Message-State: AJcUukcGUo2iqwO4QCzTrfFDXuyO0/dtpKoE427uDOSQDEEm7VlTijKp bZK6l5Nmmj3VR+xTlKPU6V+grhAUVgU= X-Google-Smtp-Source: ALg8bN4E9m2WLjVsaVsQIF2QxgYgJS9i+klbY4abyLLwvQMH/8CawCutKs8eg+Ng6qxEkGljJ4c/Tw== X-Received: by 2002:a63:c42:: with SMTP id 2mr18872942pgm.372.1548659460390; Sun, 27 Jan 2019 23:11:00 -0800 (PST) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id z186sm41359984pfz.119.2019.01.27.23.10.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Jan 2019 23:10:59 -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 18/24] sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_AUTH_ACTIVE_KEY sockopt Date: Mon, 28 Jan 2019 15:08:40 +0800 Message-Id: X-Mailer: git-send-email 2.1.0 In-Reply-To: <70a401b7942eae75d2834dcbefe242f5eb4ad28d.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> 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_auth_key. SCTP_CURRENT_ASSOC is supported for SCTP_AUTH_ACTIVE_KEY in this patch. Signed-off-by: Xin Long --- net/sctp/socket.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index ec969c0..3345eb1 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3832,8 +3832,9 @@ static int sctp_setsockopt_active_key(struct sock *sk, unsigned int optlen) { struct sctp_endpoint *ep = sctp_sk(sk)->ep; - struct sctp_authkeyid val; struct sctp_association *asoc; + struct sctp_authkeyid val; + int ret = 0; if (!ep->auth_enable) return -EACCES; @@ -3844,10 +3845,32 @@ static int sctp_setsockopt_active_key(struct sock *sk, return -EFAULT; asoc = sctp_id2assoc(sk, val.scact_assoc_id); - if (!asoc && val.scact_assoc_id && sctp_style(sk, UDP)) + if (!asoc && val.scact_assoc_id > SCTP_ALL_ASSOC && + sctp_style(sk, UDP)) return -EINVAL; - return sctp_auth_set_active_key(ep, asoc, val.scact_keynumber); + if (asoc) + return sctp_auth_set_active_key(ep, asoc, val.scact_keynumber); + + if (val.scact_assoc_id == SCTP_FUTURE_ASSOC || + val.scact_assoc_id == SCTP_ALL_ASSOC) { + ret = sctp_auth_set_active_key(ep, asoc, val.scact_keynumber); + if (ret) + return ret; + } + + if (val.scact_assoc_id == SCTP_CURRENT_ASSOC || + val.scact_assoc_id == SCTP_ALL_ASSOC) { + list_for_each_entry(asoc, &ep->asocs, asocs) { + int res = sctp_auth_set_active_key(ep, asoc, + val.scact_keynumber); + + if (res && !ret) + ret = res; + } + } + + return ret; } /* -- 2.1.0