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 91CE7C282C8 for ; Mon, 28 Jan 2019 07:11:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5F70320881 for ; Mon, 28 Jan 2019 07:11:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dJyfoL/t" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727033AbfA1HLR (ORCPT ); Mon, 28 Jan 2019 02:11:17 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:44122 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726647AbfA1HLR (ORCPT ); Mon, 28 Jan 2019 02:11:17 -0500 Received: by mail-pf1-f195.google.com with SMTP id u6so7580650pfh.11; Sun, 27 Jan 2019 23:11:16 -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=bFr3QqEVg2BgXA0J4ZbjoOFZvSD9E6b7+gjGQ69uN/k=; b=dJyfoL/tQyBPzBjqPyh/aMXKkj5x4L9eqpzPMB41yUxOGtPcEZHNkQeg0DGebySHRL tfI/g/I9s4qmkstbEL4zD1K/WbqHNQYxoSoucpAEP6PT3an9GqPbT20gk4cMovDU6o2L lPpA2J3qYbqNbgT+uhkH4Fywk1kDvnMKMooROqFoLRZRUSbXQ0NakC2k7DJYIui1ruel ED058/VnS5b5BLtKwJL/LONeJis35PktOZvtQKsAInRJCAQgIVJmJ2Nbh8TeuU7Hns0d XM3roKG7ziu3f/hc3goedl5QJEwbwGhwFBF+G7Lx2Mc4cDitiCvWcYTT7ec9YSNfeJkk p3SA== 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=bFr3QqEVg2BgXA0J4ZbjoOFZvSD9E6b7+gjGQ69uN/k=; b=Y0WGsR3iYRppCZT1u1zaXYOKxJjSv286yy1nB1BM8Y4JiAdYxQPXyemQ5Gh/M1oGb0 uDRcejKuT4suzseM+Uwho15RWnsIs7x1iyIkbYYWaJl32DdUcxu0btMwOzV/K6tP75ou IcB3N8YlyigxQTjjUNXYg5Fgm1cRRCyvaYDyv+DafiZ67FXZ96vPP6gF8ZOtNZbCLAVN bNqQeRb5ifAfLuIBs+pnOP71YaU92vqSqwtOfQ4H/75r1NTCDkxKTzLSxaYpQ+Zmmcdk zCFVNyM4HSWrtHm05WDbdTise+ue8ZyNaxEwRvSXBxumtWYW7cySqawX/46LWQJil/LZ fRpA== X-Gm-Message-State: AJcUukf3K/G2RhBrrukcxSUfFq1OL3nZV25RfH4TC342/QgTsdcedp4D lyN2EavybVg4eGNaZ6RxAIupqv8umMQ= X-Google-Smtp-Source: ALg8bN5pIBrwBjNYnNS4Yqk7OllHLNi+G9rANJf8nhidEWVmGSfXcFCwuI8DP+VwV/kr6IDHZ1W85A== X-Received: by 2002:a63:a611:: with SMTP id t17mr18617012pge.338.1548659476355; Sun, 27 Jan 2019 23:11:16 -0800 (PST) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id g136sm43022904pfb.154.2019.01.27.23.11.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Jan 2019 23:11:15 -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 20/24] sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_AUTH_DEACTIVATE_KEY sockopt Date: Mon, 28 Jan 2019 15:08:42 +0800 Message-Id: <439c70f52f7a642875ab45b7103f586bd09785d2.1548659198.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <8cc9dcf9afe96c746c525943dd95d51a804f0126.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> 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_deactivate_key. SCTP_CURRENT_ASSOC is supported for SCTP_AUTH_DEACTIVATE_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 c3463f7..3a954ac 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3933,8 +3933,9 @@ static int sctp_setsockopt_deactivate_key(struct sock *sk, char __user *optval, 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; @@ -3945,10 +3946,32 @@ static int sctp_setsockopt_deactivate_key(struct sock *sk, char __user *optval, 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_deact_key_id(ep, asoc, val.scact_keynumber); + if (asoc) + return sctp_auth_deact_key_id(ep, asoc, val.scact_keynumber); + + if (val.scact_assoc_id == SCTP_FUTURE_ASSOC || + val.scact_assoc_id == SCTP_ALL_ASSOC) { + ret = sctp_auth_deact_key_id(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_deact_key_id(ep, asoc, + val.scact_keynumber); + + if (res && !ret) + ret = res; + } + } + + return ret; } /* -- 2.1.0