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 C32CEC43381 for ; Mon, 18 Mar 2019 12:06:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8D4E320857 for ; Mon, 18 Mar 2019 12:06:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IW6tptt8" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727490AbfCRMGz (ORCPT ); Mon, 18 Mar 2019 08:06:55 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:46315 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726504AbfCRMGz (ORCPT ); Mon, 18 Mar 2019 08:06:55 -0400 Received: by mail-pg1-f195.google.com with SMTP id a22so11198079pgg.13; Mon, 18 Mar 2019 05:06:54 -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=09wigGZFIqLCye2D2+f7jmE6e801A+NvJcJ3kwrBXWY=; b=IW6tptt87GRA+EBvA43y19Y73ZPlYR9F5JccGq0IOHPMRRh6fmV/FOADtDx2sYB2aH Xy3QNMSVKaFhiKMp2koxpjMkxMwKehHaPUz2dC88mgeXhFRJlVWaVUNpgy3l86sx2CPS xJeiMUmZZQFsAbwQ7EOq7Xi1pF7e8pY4tsraSj2S41+COkI878drFnj7uO0rAEBlLqgv BtUCcgy9ZYxPFeudE0Y/OY71TjSpF/onDlAwvC36jedKv0oDDKr4nUnMFApMr3BY7Ued hZ+qwuKtEzIwG+UkBxCpP8L/PsqQy4AdWGNM7b5/OtdzJZc/VGymaC//qRhOVZmZ74WZ 2xFA== 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=09wigGZFIqLCye2D2+f7jmE6e801A+NvJcJ3kwrBXWY=; b=Dv3QlHegfudG387ki7M5fG2/UAEfXng+Fma9L2AVps5xwq5femFuKK3gAFQ1lZIQZ6 wl7oIZPmW1YnBIK1LylBIx272xNwYnGu/Gsi/AeuqvZsvuOhMuqKlV4Pq3BQmDgi4goZ cnTSddXJbrL9IGcbe7uE27xnHkxsnOWRah5VNkzHMJCAuXWr4eiyL4xrpzB2FGKg4eZY wV3NLIH17sJJsWkijBFsu5q6798n9MFQJXo0FgC0C4PQU5qxfQefkbtaVCZvCVUbOOzJ u6+SHFvwrixgt/cwaYLWrTjnUvbgMLv5P30jifRSrRZLpDIq7vkKaqBT738Mrv8cxmzG yqdA== X-Gm-Message-State: APjAAAWQkV4M/MdhOedUitXVlzsg+N3QUcL1Rd6UY/fZqItnFY92rwX9 kMhJ4vyDm2mcuGThggEJxS+kbEENONU= X-Google-Smtp-Source: APXvYqzd0RjTsAQI7KwflZSO61nlaMrhuao4Wr0YW1yHnF+1K+O+gnn4rst44CyTduuLHS3aOceptA== X-Received: by 2002:a62:fb10:: with SMTP id x16mr18923127pfm.5.1552910813982; Mon, 18 Mar 2019 05:06:53 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id f3sm14589846pfn.100.2019.03.18.05.06.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 05:06:53 -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 04/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_CONTEXT sockopt Date: Mon, 18 Mar 2019 20:06:02 +0800 Message-Id: <3d889968ad901918974cc09c78064bd4a5a24ff7.1552910681.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <47d570738f0cc850e9183731e47d15a7647764a0.1552910681.git.lucien.xin@gmail.com> References: <47d570738f0cc850e9183731e47d15a7647764a0.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_CONTEXT sockopt. Fixes: 49b037acca8c ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_CONTEXT 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 3bac039..b024a62 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3540,6 +3540,9 @@ static int sctp_setsockopt_context(struct sock *sk, char __user *optval, return 0; } + if (sctp_style(sk, TCP)) + params.assoc_id = SCTP_FUTURE_ASSOC; + if (params.assoc_id == SCTP_FUTURE_ASSOC || params.assoc_id == SCTP_ALL_ASSOC) sp->default_rcv_context = params.assoc_value; -- 2.1.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Xin Long Date: Mon, 18 Mar 2019 12:06:02 +0000 Subject: [PATCH net 04/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_CONTEXT sockopt Message-Id: <3d889968ad901918974cc09c78064bd4a5a24ff7.1552910681.git.lucien.xin@gmail.com> List-Id: References: <47d570738f0cc850e9183731e47d15a7647764a0.1552910681.git.lucien.xin@gmail.com> In-Reply-To: <47d570738f0cc850e9183731e47d15a7647764a0.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_CONTEXT sockopt. Fixes: 49b037acca8c ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_CONTEXT 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 3bac039..b024a62 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3540,6 +3540,9 @@ static int sctp_setsockopt_context(struct sock *sk, char __user *optval, return 0; } + if (sctp_style(sk, TCP)) + params.assoc_id = SCTP_FUTURE_ASSOC; + if (params.assoc_id = SCTP_FUTURE_ASSOC || params.assoc_id = SCTP_ALL_ASSOC) sp->default_rcv_context = params.assoc_value; -- 2.1.0