From patchwork Mon Mar 18 12:06:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 1057844 X-Patchwork-Delegate: davem@davemloft.net Return-Path: 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=) 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="ISV7gEYi"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44NFKM2r23z9s3q for ; Mon, 18 Mar 2019 23:06:47 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727457AbfCRMGq (ORCPT ); Mon, 18 Mar 2019 08:06:46 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:41292 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726504AbfCRMGq (ORCPT ); Mon, 18 Mar 2019 08:06:46 -0400 Received: by mail-pf1-f194.google.com with SMTP id d25so11097242pfn.8; Mon, 18 Mar 2019 05:06:46 -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=0chaWC4lk1EzP90P0h1p20Ngzc8bpCiTB97t8N7W3ZM=; b=ISV7gEYiR4outpgWtmnJuHelcQl2rZIZ8FFy5JsPhRpXd9E1RQigitRdK8oFhrQ7pF 0mXWekSF9UvhiqrC8jaWRa1d6oBM+a9URlfyUvO0XbBGM5v6erjGWG8nRi3bnItaXM59 GYKZVk1UE+8iUhoFxodJ4evJa9oIWETcvRziSDBB4iiAGVC/jBTnvfesGpgRdU19ZS+S mUyXx0cLypHilhdPF7y6LbfOgHbqUH4cJ5CHe3hibPl43UeKjX3hiJ6lAGbksAUfVJjs WksqZd5cwEFSnKoNtnuTEtrcpGUVwcfovwEeK++bB2Vpr0CYW+oMSl/AWH8TWpyjL7Tf lZnA== 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=0chaWC4lk1EzP90P0h1p20Ngzc8bpCiTB97t8N7W3ZM=; b=fuDUEtBZlYNZs+ONmvGdZz86zfP6i5Tugs97T1cGEUcoO2R4sae/dPUSCSOiYZpIEg LyOdGupJO/8vG2/XDA+bXDeBf4ci/ebMkC9y6Hy0l195l7JHGK1AeWUVWD6Tbswe3kQ9 zb4NsewUM5jz8boxJoBukBaxdcr55u3TiXC56zDD5CX3335HvGXhnU+V9B6JhS0Ex9Ia +cQGaAB5doZRCmJu1PJ69uQ41gB0DW0JaCBIZ7VZ4hoKITD83NPsROOp4elbKSucQRgI xWHHQKQBEm5ZSrV/B+UcsDoWZZrGntyQ/9s0t8awlRkleR1I42T5lIw7yCQ8jrClXwNq ljHA== X-Gm-Message-State: APjAAAWp0ZMlqs9M+y6Qi4q1iWjQslCZw9EryqEM4MaLHS+3YoDBPdVO tEXmPR2/sJ+HDlrlOJp4LrcwBGsHeUk= X-Google-Smtp-Source: APXvYqxUWbkrLjqUvgek+mFjn+XVOc1ByvpAsMfEJuYEnhzrusy/qgXX+P6zpfYCGeq5DDD+FAFTsA== X-Received: by 2002:a17:902:1123:: with SMTP id d32mr19006730pla.16.1552910805385; Mon, 18 Mar 2019 05:06:45 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id m79sm34267163pfi.60.2019.03.18.05.06.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 05:06:44 -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 03/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_DEFAULT_SNDINFO sockopt Date: Mon, 18 Mar 2019 20:06:01 +0800 Message-Id: <47d570738f0cc850e9183731e47d15a7647764a0.1552910681.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: References: 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_DEFAULT_SNDINFO sockopt. Fixes: 92fc3bd928c9 ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_DEFAULT_SNDINFO 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 4c5821b..3bac039 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3087,6 +3087,9 @@ static int sctp_setsockopt_default_sndinfo(struct sock *sk, return 0; } + if (sctp_style(sk, TCP)) + info.snd_assoc_id = SCTP_FUTURE_ASSOC; + if (info.snd_assoc_id == SCTP_FUTURE_ASSOC || info.snd_assoc_id == SCTP_ALL_ASSOC) { sp->default_stream = info.snd_sid;