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 8A094C43381 for ; Mon, 18 Mar 2019 12:07:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5A84F20857 for ; Mon, 18 Mar 2019 12:07:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CBahgN8L" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727565AbfCRMHV (ORCPT ); Mon, 18 Mar 2019 08:07:21 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:43403 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727518AbfCRMHU (ORCPT ); Mon, 18 Mar 2019 08:07:20 -0400 Received: by mail-pf1-f195.google.com with SMTP id c8so4456374pfd.10; Mon, 18 Mar 2019 05:07:20 -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=wnFkwZngbbp9o5mLXIG5QfxN0H8kuyjtbuw3f3VoD14=; b=CBahgN8L3cs89fsbkhsto1DbEc8LQ7vp5xi9tkxpeYpJCKG55Xl1kizUfiki+sEJCD jiOkenMOG5qZ4n9HA5CbMvK+Ett8lILyYAKcx6pzz1G5e9rhqPOA/X6qgmaIqspyQAT4 Wtj4/Q4lj3UhKj+6d0e8BEFvmQdhECaORnwl5buXDjsTIWQdbx0vSa7bCeIpna3rIKaw mFhM7nPc8CuYAr+GUwslzO0Bt5PVS7U/GfCRlJnzV35s+aoQnli6Twm/yrZUeykpBCIn pli+b7Hn/pDDvJX0nIkJ7Omp8S0jpK0oO1olckRkyh06LHPS58oRnWgjHtcyGGMLa+2r N1CQ== 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=wnFkwZngbbp9o5mLXIG5QfxN0H8kuyjtbuw3f3VoD14=; b=Ian1xLNhhwSWWvH9fvn/mFOantBTFNRj08JMp1iWn+Zjd29Qhll6IFS53IDYFaS8yt 7yJzR8AYfxghPovpryy8PlZWQT9DB9zosWM46+0qp/ZjEuRfLt4Hs0JIm5tT0NF5QRhF kAIWlT/P1ptGdTrKgWroeVL7NliboasJAqsebPn4ZilvGNJHe9t0zqztHPIs+xbOyWYk 5yS/wuuSR57tS9rzF15xg09jDEAjT6/cOmcCh6UqGsL/vKM51wEctfkX14hiTBCxolnQ +lhTz1srlakcgBgVQnPUqokbCDLWQyHIb5WUeKmX18nasaRmIW06XAel7vc8OMSAYIkt 92ig== X-Gm-Message-State: APjAAAUnkjTI6LJdw3p26bWZkFkbBTyiPz3q2DtDavHqxSd7Ghq8u8p1 vETcLK95QiplgpRxD7J4kdSz0Buju4Q= X-Google-Smtp-Source: APXvYqxUdTBEqKYCZcw1BuJlNSBwnFDbUxwsH6jHJPq3ZmoLxFBkLaC5f1AVpV77wZIhmB5Kj9Ubew== X-Received: by 2002:a63:6193:: with SMTP id v141mr17272823pgb.392.1552910839885; Mon, 18 Mar 2019 05:07:19 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id s6sm13766195pfe.37.2019.03.18.05.07.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 05:07:19 -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 07/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_AUTH_ACTIVE_KEY sockopt Date: Mon, 18 Mar 2019 20:06:05 +0800 Message-Id: X-Mailer: git-send-email 2.1.0 In-Reply-To: <9028a9b0f9968d629614a36cbbf79fef34935717.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> <9028a9b0f9968d629614a36cbbf79fef34935717.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_ACTIVE_KEY sockopt. Fixes: bf9fb6ad4f29 ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_AUTH_ACTIVE_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 2ac221c..1d098f0 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3871,6 +3871,9 @@ static int sctp_setsockopt_active_key(struct sock *sk, if (asoc) return sctp_auth_set_active_key(ep, asoc, val.scact_keynumber); + if (sctp_style(sk, TCP)) + val.scact_assoc_id = SCTP_FUTURE_ASSOC; + 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); -- 2.1.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Xin Long Date: Mon, 18 Mar 2019 12:06:05 +0000 Subject: [PATCH net 07/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_AUTH_ACTIVE_KEY sockopt Message-Id: List-Id: References: <47d570738f0cc850e9183731e47d15a7647764a0.1552910681.git.lucien.xin@gmail.com> <3d889968ad901918974cc09c78064bd4a5a24ff7.1552910681.git.lucien.xin@gmail.com> <446bf443557ec1433a5f85c9a1e15987df20a8df.1552910681.git.lucien.xin@gmail.com> <9028a9b0f9968d629614a36cbbf79fef34935717.1552910681.git.lucien.xin@gmail.com> In-Reply-To: <9028a9b0f9968d629614a36cbbf79fef34935717.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_ACTIVE_KEY sockopt. Fixes: bf9fb6ad4f29 ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_AUTH_ACTIVE_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 2ac221c..1d098f0 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3871,6 +3871,9 @@ static int sctp_setsockopt_active_key(struct sock *sk, if (asoc) return sctp_auth_set_active_key(ep, asoc, val.scact_keynumber); + if (sctp_style(sk, TCP)) + val.scact_assoc_id = SCTP_FUTURE_ASSOC; + 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); -- 2.1.0