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 2E8B5C43381 for ; Mon, 18 Mar 2019 12:07:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E95F320857 for ; Mon, 18 Mar 2019 12:07:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="li18D5DC" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727588AbfCRMHi (ORCPT ); Mon, 18 Mar 2019 08:07:38 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:39709 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726911AbfCRMHi (ORCPT ); Mon, 18 Mar 2019 08:07:38 -0400 Received: by mail-pf1-f193.google.com with SMTP id i17so1337722pfo.6; Mon, 18 Mar 2019 05:07:37 -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=EKT9S56mvtBW+jcK4TX80PmeCCljWxfuobiEKW+B91o=; b=li18D5DC8T+bWmBux2AI9dwcjiNKf+dF7KeZEuW360HZWfYZdowtxs7DNN1Eu5fjNi 5Er5WhNIH4WgMf+3YL5M24a8d3eHD5K093ZGbzolKFZXhVIuqcdGVHlvEVNGYsFNHw62 QtOZT+FpyDMenecj2RafSZZgdnZIwiAk8JwgKTt/ZTJD24tF6QxcQKSQu8VMD9IKQ7Wk aiK+4ZLbesdR034VVykRpaX7z0w8pyjudwrvb8hNwBaxEvys/tFUuU5czwKxaysogNmJ TqvBwL/uVkG+EBrcYXoyqHFJLoAJGoQhlefLBzaAmcFp4vu08B43u/0BUiLTWmKB6OvO 2DXA== 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=EKT9S56mvtBW+jcK4TX80PmeCCljWxfuobiEKW+B91o=; b=hqEa1r1aAp9u0880j8c32HGVmftIwvEIN0fV9vESWkUNBGCg9HOZ8QzFhJwMW7Jshp IJHgNtG7FobOzhhcjm8u5GYfeGpj8pD1D70+uR9xHGTC7Hn8s+AdL2uSFT/0A8SL8LZZ awtKyDZgy22IkL8Sb8thqFl5BWG09nd21a9c0fWBeetxtwFRHY4xoLZjdINMFhf8PMn+ xTl2X+3GzesQvQSWvtrrsSjT04gSsEVLsgCmTRuRcRtJjg+m8I7K1+fvtRxYaSo/gPwn s+18Lffh7N5HsLVKPIt5V9TjIysALSDdyC2Dx4NGtvg7WVxkAAI+EvWzTMMNE2vf1wZ/ gpNA== X-Gm-Message-State: APjAAAX7A4/Gdia0fy95N4o3ZmcItcTwteygQAGiJ6wzwCxtfYYG1sRh bog6a5byJ40ENJPbOlfkxZAYnTMrs1U= X-Google-Smtp-Source: APXvYqx9dXR7ZZzhcCh8lG4GXKz0f2nJCEJ1Ng440UGyorHPBGwZpBQ7bWnyCTluDwfy9jyB52ITuQ== X-Received: by 2002:aa7:838c:: with SMTP id u12mr18629501pfm.189.1552910857014; Mon, 18 Mar 2019 05:07:37 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id x23sm11705251pgf.10.2019.03.18.05.07.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 05:07:36 -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 09/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_AUTH_DEACTIVATE_KEY sockopt Date: Mon, 18 Mar 2019 20:06:07 +0800 Message-Id: X-Mailer: git-send-email 2.1.0 In-Reply-To: <0c9808b498eb088a9146a09c79d795e30e3c79c5.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> <0c9808b498eb088a9146a09c79d795e30e3c79c5.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_DEACTIVATE_KEY sockopt. Fixes: 2af66ff3edc7 ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_AUTH_DEACTIVATE_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 087ca0b..0187444 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3978,6 +3978,9 @@ static int sctp_setsockopt_deactivate_key(struct sock *sk, char __user *optval, if (asoc) return sctp_auth_deact_key_id(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_deact_key_id(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:07 +0000 Subject: [PATCH net 09/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_AUTH_DEACTIVATE_KEY socko 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> <0c9808b498eb088a9146a09c79d795e30e3c79c5.1552910681.git.lucien.xin@gmail.com> In-Reply-To: <0c9808b498eb088a9146a09c79d795e30e3c79c5.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_DEACTIVATE_KEY sockopt. Fixes: 2af66ff3edc7 ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_AUTH_DEACTIVATE_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 087ca0b..0187444 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3978,6 +3978,9 @@ static int sctp_setsockopt_deactivate_key(struct sock *sk, char __user *optval, if (asoc) return sctp_auth_deact_key_id(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_deact_key_id(ep, asoc, val.scact_keynumber); -- 2.1.0