| Message ID | a1956b59384a88fe50dac1852b4666793ba8c663.1552910681.git.lucien.xin@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show
Return-Path: <netdev-owner@vger.kernel.org> X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="V4wtBKIc"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44NFLy0PsJz9sBF for <patchwork-incoming-netdev@ozlabs.org>; Mon, 18 Mar 2019 23:08:10 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727658AbfCRMIF (ORCPT <rfc822;patchwork-incoming-netdev@ozlabs.org>); Mon, 18 Mar 2019 08:08:05 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:36573 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727643AbfCRMID (ORCPT <rfc822;netdev@vger.kernel.org>); Mon, 18 Mar 2019 08:08:03 -0400 Received: by mail-pg1-f195.google.com with SMTP id r124so11246684pgr.3; Mon, 18 Mar 2019 05:08:03 -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=dZz3kRaZ69mOrO5KllbVNnmfKpsSsLjiKDgabgJgSx8=; b=V4wtBKIc7mKlRZc4xpN9m36Ej9Dw1MzvViij44p3Iem5EekZuaAoZ4die0AWDnpTGT LnSs4m5eMSDIhJ6BrfQ2tsQUQ5WPjpf70nbLdgeexQfQAnthGdn/BSY/1FED0pNmNFmK opf3evOQTGPj+Ui7pFodj4kjr8PGKOoimwRsK4c7dnJUKWcU4OVbX3wntJAShskhgzsf RUnbEohSRR39qdFTIyHd80WA5SyXnVD0Yo6/YmWjtwTIR64hPL0mKWE6a/dJJ03+8QaV /JzkbWSBTL4lDGAdgY9/CaOIz73W3rCPj7WRSY5s68DIMlRVPYvIzrp2/fEV7VVx+8A4 UNgQ== 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=dZz3kRaZ69mOrO5KllbVNnmfKpsSsLjiKDgabgJgSx8=; b=cxMxPO+0cUiehUtM7BkKhWL13tOdLhR7rR1rHac8+0ApdTUNvcAy86aMZLnuLzPTBK l+7pA0zYWkgLtXD0Mc9KVDSh/ci7g8k5LLAKW6qW1qSy+0y95cZwzFGRCP+fMnfWE01h Di4MCP2iNZqorA2bRb/wRYxIxwtIBXQuxSb0swK6wRnp43ObXLQtTkUmU2Ob0FrLv/G1 X9i+peRZO5JhdGasFeyB11OgGgQwl7H0AKNzbuGqLLlkVIHw0CNm9z2FvhJKIZJ0qa6Z iz7Nx4HSyS6AtLP50d53XvPuzZma8esYpIT83CNjUM/eyjPQfUfIYBe77tFJHn0VRdMD HfVA== X-Gm-Message-State: APjAAAW8JFjx4AHTEAqcW8oaDuxhdj3hi4XgavR/moUA/PgF+MrILXU7 6llkEcLTof1T+SFwakU5rADJQWp6SMs= X-Google-Smtp-Source: APXvYqyv8C6MFNbafZXdsgYQXdzDMgpqfP111Rv3qVJl71Mm14O/ByD9a8rN0zUEF2AWM5VYalM9Ag== X-Received: by 2002:a65:5c07:: with SMTP id u7mr17491662pgr.320.1552910882598; Mon, 18 Mar 2019 05:08:02 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id d12sm8177476pfh.168.2019.03.18.05.08.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 05:08:01 -0700 (PDT) From: Xin Long <lucien.xin@gmail.com> To: network dev <netdev@vger.kernel.org>, linux-sctp@vger.kernel.org Cc: davem@davemloft.net, Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>, Neil Horman <nhorman@tuxdriver.com> Subject: [PATCH net 12/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_EVENT sockopt Date: Mon, 18 Mar 2019 20:06:10 +0800 Message-Id: <a1956b59384a88fe50dac1852b4666793ba8c663.1552910681.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1b33cb70222974d65a7194a506c9e99d474732c2.1552910681.git.lucien.xin@gmail.com> References: <cover.1552910681.git.lucien.xin@gmail.com> <a866141aba7511710929fffd71b0b911ddda28f4.1552910681.git.lucien.xin@gmail.com> <b7541db7198a1df5d75100bd9cb19678613c0a10.1552910681.git.lucien.xin@gmail.com> <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> <ead4f7e6f620d64b9616b8e394e559c55427229e.1552910681.git.lucien.xin@gmail.com> <0c9808b498eb088a9146a09c79d795e30e3c79c5.1552910681.git.lucien.xin@gmail.com> <fa16260b4714687bba2cfbf2703347c9d0d9f6c2.1552910681.git.lucien.xin@gmail.com> <35a7b393cc72087426f3c7bbd47c6fa7cbc838ae.1552910681.git.lucien.xin@gmail.com> <1b33cb70222974d65a7194a506c9e99d474732c2.1552910681.git.lucien.xin@gmail.com> In-Reply-To: <cover.1552910681.git.lucien.xin@gmail.com> References: <cover.1552910681.git.lucien.xin@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
| Series |
sctp: fix ignoring asoc_id for tcp-style sockets on some setsockopts
|
expand
|
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 6b0ee89..10df48a 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -4574,6 +4574,9 @@ static int sctp_setsockopt_event(struct sock *sk, char __user *optval, if (asoc) return sctp_assoc_ulpevent_type_set(¶m, asoc); + if (sctp_style(sk, TCP)) + param.se_assoc_id = SCTP_FUTURE_ASSOC; + if (param.se_assoc_id == SCTP_FUTURE_ASSOC || param.se_assoc_id == SCTP_ALL_ASSOC) sctp_ulpevent_type_set(&sp->subscribe,
A similar fix as Patch "sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_DEFAULT_SEND_PARAM sockopt" on SCTP_EVENT sockopt. Fixes: d251f05e3ba2 ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_EVENT sockopt") Signed-off-by: Xin Long <lucien.xin@gmail.com> --- net/sctp/socket.c | 3 +++ 1 file changed, 3 insertions(+)