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=-8.8 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 3FD2FC43381 for ; Mon, 18 Mar 2019 12:07:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0C17620857 for ; Mon, 18 Mar 2019 12:07:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="pK9ApgeG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727529AbfCRMHN (ORCPT ); Mon, 18 Mar 2019 08:07:13 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:40321 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726504AbfCRMHM (ORCPT ); Mon, 18 Mar 2019 08:07:12 -0400 Received: by mail-pg1-f196.google.com with SMTP id u9so11221793pgo.7; Mon, 18 Mar 2019 05:07:12 -0700 (PDT) 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=6VEBh4PKVVTatraNBQnHRt2tGT0yzq7WR30ueUN0Fxg=; b=pK9ApgeGlbS0kUyzqoqr5ILYtdHqIoW8TgRDrCUFi15yKdeklw3vpfwt+GVuNakMIW URLd2xJ+tBJFjsMvfWcp2ZKmIjhC339FBJEUGQRXZhwnrhDUwQBY8KMhWc8die110qUV bTd7mJFNRZ4HwcvD9sjeD52pGK3YxtpXOtY7eFc3YyX86hDjBeus3dKH2GobuqMepaZ7 nr5ORnoGtE/C6j2TxI1eb/QUOS4Eo/a6AFITZC2XSWWJ5Scc4QFNczMX0B7/KEHxCncG mYZbTDBAh4cdv+WqOjW668EgIc5JL/muCFqePZSKmJTs7TwabiMggoI0Qju1umKqYktf hjAA== 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=6VEBh4PKVVTatraNBQnHRt2tGT0yzq7WR30ueUN0Fxg=; b=qI5jnqasSSFrK+zACtxmZOJ7cf9pzzuYmHSzXs2aZMJo9DfRMb7+NW44IXVhkSOIhZ uWt8atPG5We6Yd1tvTNlKL8WbZ3V+KexrFrh5EZgvJ52GTDVwjALxm0z1FIwBt6e1/Yp kjY8QcSdnFfFclu3soJpPBPqm7pSSAlZFeTGOuSWNOmr+rGJcNDvL5hgolWFYXGfhkpT hAD4pd1NMxSRyF1XMciOxaJmvOaBgDMpYkkZ6shfx+Q3dtaBCzuHmSeVFCwcspJoWKOV BuGG1NWeJVx4sw9m4IKOA/SNmdaX57l2fxMZIF7aRTwfYPq8pySwb3rfcXvwS5jMRtro 9GhQ== X-Gm-Message-State: APjAAAWR5vyP8dT4Okp0VrA1SgrNGRs1SgGgDzhCvhUfh0EL4kflwrp8 uBVHM7Rk5yA4JbZ54Zv/Dxmaadkrg5s= X-Google-Smtp-Source: APXvYqx0x4dRXkIPuYn6+r9OD/ukKZNYK+x1bMgPXYdNSeFiiOZ88rTUmUbDh2kDtCoSk6d3HHQFWA== X-Received: by 2002:a65:5184:: with SMTP id h4mr17382674pgq.32.1552910831518; Mon, 18 Mar 2019 05:07:11 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id d23sm17201869pfn.69.2019.03.18.05.07.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 05:07:10 -0700 (PDT) From: Xin Long To: network dev , linux-sctp@vger.kernel.org Cc: davem@davemloft.net, Marcelo Ricardo Leitner , Neil Horman Subject: [PATCH net 06/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_AUTH_KEY sockopt Date: Mon, 18 Mar 2019 20:06:04 +0800 Message-Id: <9028a9b0f9968d629614a36cbbf79fef34935717.1552910681.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <446bf443557ec1433a5f85c9a1e15987df20a8df.1552910681.git.lucien.xin@gmail.com> References: <47d570738f0cc850e9183731e47d15a7647764a0.1552910681.git.lucien.xin@gmail.com> <3d889968ad901918974cc09c78064bd4a5a24ff7.1552910681.git.lucien.xin@gmail.com> <446bf443557ec1433a5f85c9a1e15987df20a8df.1552910681.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 A similar fix as Patch "sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_DEFAULT_SEND_PARAM sockopt" on SCTP_AUTH_KEY sockopt. Fixes: 7fb3be13a236 ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_AUTH_KEY sockopt") Signed-off-by: Xin Long --- net/sctp/socket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index df879b1..2ac221c 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3813,6 +3813,9 @@ static int sctp_setsockopt_auth_key(struct sock *sk, goto out; } + if (sctp_style(sk, TCP)) + authkey->sca_assoc_id = SCTP_FUTURE_ASSOC; + if (authkey->sca_assoc_id == SCTP_FUTURE_ASSOC || authkey->sca_assoc_id == SCTP_ALL_ASSOC) { ret = sctp_auth_set_key(ep, asoc, authkey); -- 2.1.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Xin Long Date: Mon, 18 Mar 2019 12:06:04 +0000 Subject: [PATCH net 06/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_AUTH_KEY sockopt Message-Id: <9028a9b0f9968d629614a36cbbf79fef34935717.1552910681.git.lucien.xin@gmail.com> List-Id: References: <47d570738f0cc850e9183731e47d15a7647764a0.1552910681.git.lucien.xin@gmail.com> <3d889968ad901918974cc09c78064bd4a5a24ff7.1552910681.git.lucien.xin@gmail.com> <446bf443557ec1433a5f85c9a1e15987df20a8df.1552910681.git.lucien.xin@gmail.com> In-Reply-To: <446bf443557ec1433a5f85c9a1e15987df20a8df.1552910681.git.lucien.xin@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: network dev , linux-sctp@vger.kernel.org Cc: davem@davemloft.net, Marcelo Ricardo Leitner , Neil Horman A similar fix as Patch "sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_DEFAULT_SEND_PARAM sockopt" on SCTP_AUTH_KEY sockopt. Fixes: 7fb3be13a236 ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_AUTH_KEY sockopt") Signed-off-by: Xin Long --- net/sctp/socket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index df879b1..2ac221c 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3813,6 +3813,9 @@ static int sctp_setsockopt_auth_key(struct sock *sk, goto out; } + if (sctp_style(sk, TCP)) + authkey->sca_assoc_id = SCTP_FUTURE_ASSOC; + if (authkey->sca_assoc_id = SCTP_FUTURE_ASSOC || authkey->sca_assoc_id = SCTP_ALL_ASSOC) { ret = sctp_auth_set_key(ep, asoc, authkey); -- 2.1.0