From patchwork Mon Mar 18 12:06:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 1057851 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="kJIeNGGC"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44NFLW2xX2z9s3q for ; Mon, 18 Mar 2019 23:07:47 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727600AbfCRMHq (ORCPT ); Mon, 18 Mar 2019 08:07:46 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:37045 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726897AbfCRMHq (ORCPT ); Mon, 18 Mar 2019 08:07:46 -0400 Received: by mail-pf1-f196.google.com with SMTP id 8so7706416pfr.4; Mon, 18 Mar 2019 05:07: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=UtJ6Wlf7gzxELFm7P7esCq3tLZ9Cxz+olSgu00HnZm8=; b=kJIeNGGCY4JXNWSttiLKNjuJSErZ3QVMGfEGU+Ert3cWbzXHElsxQkxNrvg/a18BNI ZPNqADorxH7vWeyuSohgguel39ILk922OR5zEkNZHNCHg2Pg7riq9Nlma8EXNobYrr3P rvyW/9X8uyQWvoNQeqU+N5/0qaYEaKKz8QhIvgtxJgIIlU9SFQO8mL6wfrvPLqu6B2A8 Z8gZoXVddUw4o77clu2sHpW3JI2VfdsCokjE1OsQD9+/zKTM4I5XKtyEd3USPvcgwI1k zOuhmdQEWYa/f8CjT8EgPH1JQndc579Qt7nnKqL4zeEwH4pAORD/QEV4ID6gf13tthoI Ar6g== 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=UtJ6Wlf7gzxELFm7P7esCq3tLZ9Cxz+olSgu00HnZm8=; b=GUF8RbE0iQ/PVPCX4l+8UVsMw0Z4qYl7GbWxxV6MRGvxQyd0q9jf1Z28EYb1PVfJp+ vuFoLuxI2YfFjljjvzFANG36WhyA8kOwPqjpPcur6dNzwBVE+LYUPoa4moIsm48YE4xc FIjy96fIZpEJUOfzfQnq9+NqWIzP1J1oPxBgfQgUsPLeKq/MPR3bDRD3vryTLD7WIfa/ EENxB9KUCHHsTajycntrccGKtM37kdpzzZq/DuF99P8cMO9WXK1ovgiDgsYV1/FmHkR7 KxYCPn/PcOTJ0bf9113GRP3wnS7n9Lxwz01z8uP8f2FdDMaX+EtmDruzfcPLzbLtwRHz NJZw== X-Gm-Message-State: APjAAAX8kJ3eqKPKI5Gzh9lw64lJkgZwir/ro1j3/IQJPdUyHsdW2KK9 3ZeT7fnnDXr1IZi6Rr7Hk+UMlt+Kl8o= X-Google-Smtp-Source: APXvYqzUXb48XZ8zGtLJo34PKUADST1HZ2RXGjIJLHB1nHDU6HTKgEl8+SIJRHxXUi+dMfsmYRld7Q== X-Received: by 2002:a62:55c7:: with SMTP id j190mr14785467pfb.226.1552910865412; Mon, 18 Mar 2019 05:07:45 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id m67sm16810681pfj.70.2019.03.18.05.07.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 05:07: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 10/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_DEFAULT_PRINFO sockopt Date: Mon, 18 Mar 2019 20:06:08 +0800 Message-Id: <35a7b393cc72087426f3c7bbd47c6fa7cbc838ae.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> <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_DEFAULT_PRINFO sockopt. Fixes: 3a583059d187 ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_DEFAULT_PRINFO 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 0187444..238e5c8 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -4196,6 +4196,9 @@ static int sctp_setsockopt_default_prinfo(struct sock *sk, goto out; } + if (sctp_style(sk, TCP)) + info.pr_assoc_id = SCTP_FUTURE_ASSOC; + if (info.pr_assoc_id == SCTP_FUTURE_ASSOC || info.pr_assoc_id == SCTP_ALL_ASSOC) { SCTP_PR_SET_POLICY(sp->default_flags, info.pr_policy);