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 53C85C43381 for ; Mon, 18 Mar 2019 12:07:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1C26720857 for ; Mon, 18 Mar 2019 12:07:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PZTWPyG8" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727582AbfCRMHa (ORCPT ); Mon, 18 Mar 2019 08:07:30 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:34118 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727079AbfCRMH3 (ORCPT ); Mon, 18 Mar 2019 08:07:29 -0400 Received: by mail-pg1-f196.google.com with SMTP id v12so11267498pgq.1; Mon, 18 Mar 2019 05:07:29 -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=fniJOUy0HuaK+xD1FqHQp0BVQ/LaFKPWf4XljYu4mIA=; b=PZTWPyG8nC0xKvK6a8a5LRyPlQZ5ivxFFsmB2LAQIG8BncRreCjHjlnW7jaETf3NLs XdL+keXf+rEp3vQbQurGkRo+/pbZ0TKy0hZMOHGTIFO3f5nJVNQ86cPFqsEFh2Qi1e70 QVWpW0u0E/72CMNFMUg5B8t5EgJiyFkHvbMVt4QbQLpLxnaqSBc9xHxmhyFhtBsTq158 /dtVmGNUoDbyMvMEzzUvjsTBI7WKwMafEdyFta65SEGh5qzxiu6b4kD2SmoqWvvVLCpk mXMM2jcUoW2ERF1F27MynZrzCCoqEveTat/+X1tHiUMLm5z+u4/o+JIu7lE/5l6NShca V3xA== 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=fniJOUy0HuaK+xD1FqHQp0BVQ/LaFKPWf4XljYu4mIA=; b=Ju7U9/2Andoj4uGmezSo5bsCgDsDORe9JJ224oRwA+HV0cPT88l8Gpalih/q0A5EdK P5M8gbzcmAa7zxj7FLnGigWsEPmZsuKR0/QgveBS6ozobuWHjzztNnSpHV4FL/pfQePy wEKWXTF4VPoPEpv2ELxhB+vokN/tBeu5lF0zrhqPNnX4qe51+Teo3OYtxjiF5Kdc5Q7z d174g2u8+hNJGj8mhW7mYHp64RNhY0jb40kO8w83hrGpmasEUrZz1BftnwR10H2jzuUu Fw8LkysCuk/po4uRw6KLfAgqzHtrwPHgQsw61QsV1r4CKn2E63xpc9u3va6XUaGAQG+8 O4mQ== X-Gm-Message-State: APjAAAVKagJj9VnoPRFcjl+nqMBACbnKgQTLGrmz1t+vFXj2DrLki0br CWEnOh/fd6hJbfb32cY/UOirmRJxRa8= X-Google-Smtp-Source: APXvYqzdu1ABdcwFurOXW741m1nndkB1cWbRAKO73oUYsp3DaZuyOwytKQE4wNx+Sdc/tS2nfBL+5w== X-Received: by 2002:a17:902:3f83:: with SMTP id a3mr18825208pld.6.1552910848721; Mon, 18 Mar 2019 05:07:28 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id l63sm14176510pfc.89.2019.03.18.05.07.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 05:07:27 -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 08/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_AUTH_DELETE_KEY sockopt Date: Mon, 18 Mar 2019 20:06:06 +0800 Message-Id: <0c9808b498eb088a9146a09c79d795e30e3c79c5.1552910681.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: 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_DELETE_KEY sockopt. Fixes: 3adcc300603e ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_AUTH_DELETE_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 1d098f0..087ca0b 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3925,6 +3925,9 @@ static int sctp_setsockopt_del_key(struct sock *sk, if (asoc) return sctp_auth_del_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_del_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:06 +0000 Subject: [PATCH net 08/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_AUTH_DELETE_KEY sockopt Message-Id: <0c9808b498eb088a9146a09c79d795e30e3c79c5.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> <9028a9b0f9968d629614a36cbbf79fef34935717.1552910681.git.lucien.xin@gmail.com> In-Reply-To: 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_DELETE_KEY sockopt. Fixes: 3adcc300603e ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_AUTH_DELETE_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 1d098f0..087ca0b 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3925,6 +3925,9 @@ static int sctp_setsockopt_del_key(struct sock *sk, if (asoc) return sctp_auth_del_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_del_key_id(ep, asoc, val.scact_keynumber); -- 2.1.0