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 554F5C282C8 for ; Mon, 28 Jan 2019 07:10:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 229F220881 for ; Mon, 28 Jan 2019 07:10:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="j+gb0VyR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726993AbfA1HK6 (ORCPT ); Mon, 28 Jan 2019 02:10:58 -0500 Received: from mail-pl1-f195.google.com ([209.85.214.195]:39958 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726672AbfA1HK6 (ORCPT ); Mon, 28 Jan 2019 02:10:58 -0500 Received: by mail-pl1-f195.google.com with SMTP id u18so7350961plq.7; Sun, 27 Jan 2019 23:10:57 -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=j1H6W6A6OlDLoGAZgkvwOtA9rAug3gKXEexbNpM1S7k=; b=j+gb0VyR2T8J2iutTZZAOd5DdzJqdPR/4fWal4M6MZY1+4Ei8WhjNS7kn+qQK4I0LE aN6oscatWJHaCyWdE7wl+FSxH+Je1ckDxZFlAJvlOXnN8TbDbJvMQckZlL4AhYERho12 mY8+VscdMrY6KuyrAQKOAalpnpwmPBWLq4JoktZmnHC5PXukyKU4bjOxnvmLsYw03ufT Kxf7Gd+gDcYZfh0s9vaE7L/ofxlSbD3ZBdKYpn0BtfNJx9rWHZL23H8S1mPnYSUAUnme Lk/O6Ip/XO1iGeScYexwzZUrDuwYwcLgUI3y8KPzc/fNPM1Xb2gtpgaBpdkzRD0kuU+9 3IUQ== 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=j1H6W6A6OlDLoGAZgkvwOtA9rAug3gKXEexbNpM1S7k=; b=tZXL2UNDeXgjydDCO3z4gOGityaym8F6anE7J5F/+sENf5ZGiIYnS3t2cSWHMqpG6x k/eqJYkcqwZ/YLiDrLoQdj3ywEnVOCnJNrajacGvJR1woH1En4g1qn6ZfUTtDBAiTcAf a4j4mmS1A0gcyhPBriKxWOp9h2/VPUh/5+gc3QvOABE7Rm+4ZiOGpsEej7da6bwZAwEr 2IUoPT4WNRGOx7Ga98sVhV6m5aPXDcw8Rz1ECN+TOFpSGhUml7uZmLtqU0ph9hCW546i nJxWQf1BIacSm27EO1/UWarAfgiSVeSanxl6VHuEN8FpDS/zwwVejcEZmmaw51We1lzF 8tgA== X-Gm-Message-State: AJcUukd4AgeVDDXY2IWQ0WFI2zDVPma2NWnbpSbCcIj1Bun13z2K1D0B hNAIaWqRU80JG19FEVFzYFyRUBWIpA8= X-Google-Smtp-Source: ALg8bN5PhxVSm4U0kTtHpwXcU/4feiwVYIxK9Ikf47lNXkKW8EC9AEcSzJyAY9VeBS8RyEkIlY3fhA== X-Received: by 2002:a17:902:7614:: with SMTP id k20mr21014073pll.285.1548659457426; Sun, 27 Jan 2019 23:10:57 -0800 (PST) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id 15sm55481122pfr.55.2019.01.27.23.10.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Jan 2019 23:10:56 -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 17/24] sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_AUTH_KEY sockopt Date: Mon, 28 Jan 2019 15:08:39 +0800 Message-Id: <70a401b7942eae75d2834dcbefe242f5eb4ad28d.1548659198.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1788c2da8ddb39854267ea1321d725635a7c983e.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> 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_KEY in this patch. Signed-off-by: Xin Long --- net/sctp/socket.c | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index bba352e..ec969c0 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3768,7 +3768,7 @@ static int sctp_setsockopt_auth_key(struct sock *sk, struct sctp_endpoint *ep = sctp_sk(sk)->ep; struct sctp_authkey *authkey; struct sctp_association *asoc; - int ret; + int ret = -EINVAL; if (!ep->auth_enable) return -EACCES; @@ -3778,25 +3778,44 @@ static int sctp_setsockopt_auth_key(struct sock *sk, /* authkey->sca_keylength is u16, so optlen can't be bigger than * this. */ - optlen = min_t(unsigned int, optlen, USHRT_MAX + - sizeof(struct sctp_authkey)); + optlen = min_t(unsigned int, optlen, USHRT_MAX + sizeof(*authkey)); authkey = memdup_user(optval, optlen); if (IS_ERR(authkey)) return PTR_ERR(authkey); - if (authkey->sca_keylength > optlen - sizeof(struct sctp_authkey)) { - ret = -EINVAL; + if (authkey->sca_keylength > optlen - sizeof(*authkey)) goto out; - } asoc = sctp_id2assoc(sk, authkey->sca_assoc_id); - if (!asoc && authkey->sca_assoc_id && sctp_style(sk, UDP)) { - ret = -EINVAL; + if (!asoc && authkey->sca_assoc_id > SCTP_ALL_ASSOC && + sctp_style(sk, UDP)) goto out; + + if (asoc) { + ret = sctp_auth_set_key(ep, asoc, authkey); + goto out; + } + + if (authkey->sca_assoc_id == SCTP_FUTURE_ASSOC || + authkey->sca_assoc_id == SCTP_ALL_ASSOC) { + ret = sctp_auth_set_key(ep, asoc, authkey); + if (ret) + goto out; + } + + ret = 0; + + if (authkey->sca_assoc_id == SCTP_CURRENT_ASSOC || + authkey->sca_assoc_id == SCTP_ALL_ASSOC) { + list_for_each_entry(asoc, &ep->asocs, asocs) { + int res = sctp_auth_set_key(ep, asoc, authkey); + + if (res && !ret) + ret = res; + } } - ret = sctp_auth_set_key(ep, asoc, authkey); out: kzfree(authkey); return ret; -- 2.1.0