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=-9.1 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 E9DEFC282CB for ; Mon, 28 Jan 2019 07:10:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B78BE20881 for ; Mon, 28 Jan 2019 07:10:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="l496yQR2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726982AbfA1HKe (ORCPT ); Mon, 28 Jan 2019 02:10:34 -0500 Received: from mail-pl1-f194.google.com ([209.85.214.194]:42638 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726667AbfA1HKe (ORCPT ); Mon, 28 Jan 2019 02:10:34 -0500 Received: by mail-pl1-f194.google.com with SMTP id y1so7349438plp.9; Sun, 27 Jan 2019 23:10:33 -0800 (PST) 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=XsKhHpheDys7ilXPjw9I0AKDgyZCdd2+GrE+MpElIIc=; b=l496yQR2QnyVZL6SXbq6sOBfHgcWxU/WWWwffkGVL7enigZeqiPePD8RS4x7fo3IVE 4zilxIi0FoUEAfyl4yUK7v5A52AuC6M09vg0gebRergQoLn5LPSbkHvPfuxbFKdWBg+w Z05x1cl7R6OybckaOgv7C4xSJIQYO7N5zO2uTMEf3+2vlAAIP/YqWm+zQ/QN21Cupfyc 8+7BeIzIZV5e2TXUwPyzJuK+gS6DjcFFTuvL0livi8I51KQxGksR2TB8gS0gFK01fn0i JQbcWOKlBQrHMxV8029g8S/k1ygcoLMJrPBCeu4Et60zPls4z0MB5hPJFHp5MjLf9HTr Vcrw== 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=XsKhHpheDys7ilXPjw9I0AKDgyZCdd2+GrE+MpElIIc=; b=XymDefkeAUb7bZzrkdBkr6Eclx9ySUOCpLr0WLmb2QMHK33I0piw12hebxuzz0174X I89kRlj2YrgTZrhBCtaZ4Oi6etOxkYWgmcgz1nlQDEWT1ewVMj0OHkQMplxW93rcS1EL wmct3QsZUHAgJbcaW48UXedujvQjGrx2vr/W4uxbXFi7fD4xTBMzptuey0b4gMJM+XPR BJo+0xr28Bxv+b91xvp4Nd+GO5gZmdT+GtFMocEIMClza7Vu1rxBG9ALw+Ag+Jm47p2i jihpVhh9LjjJ9sM+poBKz2hxRO+gchUqfeoZa8+48rJ190E4RV1gqINtyKl+CXhFqRyy SFNQ== X-Gm-Message-State: AJcUukc8n7Mn2kngcpseyevkrvS5Ava9X4bI1yMN+/f85VL9tDvfHlio MCMw01siwhbrkJ9+kiE1DQYkZnViaNU= X-Google-Smtp-Source: ALg8bN5CbHszhfWYelCLHsDvM25ClxGfgoSJaPE3hiSMG1/1Cu7WXBbzuYdM6cJUQkmW8ep3NMjJag== X-Received: by 2002:a17:902:7b91:: with SMTP id w17mr20711379pll.111.1548659433532; Sun, 27 Jan 2019 23:10:33 -0800 (PST) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id p6sm44534635pfn.53.2019.01.27.23.10.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Jan 2019 23:10:33 -0800 (PST) From: Xin Long To: network dev , linux-sctp@vger.kernel.org Cc: Marcelo Ricardo Leitner , Neil Horman , davem@davemloft.net Subject: [PATCH net-next 14/24] sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_DEFAULT_SNDINFO sockopt Date: Mon, 28 Jan 2019 15:08:36 +0800 Message-Id: X-Mailer: git-send-email 2.1.0 In-Reply-To: <5d9d0bf635fb89cc3933b256e5e41dd3958c61d6.1548659198.git.lucien.xin@gmail.com> References: <3ca66b981a0fe9368bd976676fe7450634b091cd.1548659198.git.lucien.xin@gmail.com> <16e83f8259873a6818863586e6a3fcb1e2e3717b.1548659198.git.lucien.xin@gmail.com> <088bc37947694e4e80302b075f767a7828ea4a05.1548659198.git.lucien.xin@gmail.com> <285500315e06236e468142d80c6557eae4898b36.1548659198.git.lucien.xin@gmail.com> <17140f5cc5fc1961e3e7cf74888affd55e0e6c06.1548659198.git.lucien.xin@gmail.com> <33a798e9b29f2dcbe6dd132cb801b4960d1411a5.1548659198.git.lucien.xin@gmail.com> <5d9d0bf635fb89cc3933b256e5e41dd3958c61d6.1548659198.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 Check with SCTP_ALL_ASSOC instead in sctp_setsockopt_default_sndinfo and check with SCTP_FUTURE_ASSOC instead in sctp_getsockopt_default_sndinfo, it's compatible with 0. SCTP_CURRENT_ASSOC is supported for SCTP_DEFAULT_SNDINFO in this patch. Signed-off-by: Xin Long --- net/sctp/socket.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 3d3b4f0..6a674cf 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3067,20 +3067,37 @@ static int sctp_setsockopt_default_sndinfo(struct sock *sk, return -EINVAL; asoc = sctp_id2assoc(sk, info.snd_assoc_id); - if (!asoc && info.snd_assoc_id && sctp_style(sk, UDP)) + if (!asoc && info.snd_assoc_id > SCTP_ALL_ASSOC && + sctp_style(sk, UDP)) return -EINVAL; + if (asoc) { asoc->default_stream = info.snd_sid; asoc->default_flags = info.snd_flags; asoc->default_ppid = info.snd_ppid; asoc->default_context = info.snd_context; - } else { + + return 0; + } + + if (info.snd_assoc_id == SCTP_FUTURE_ASSOC || + info.snd_assoc_id == SCTP_ALL_ASSOC) { sp->default_stream = info.snd_sid; sp->default_flags = info.snd_flags; sp->default_ppid = info.snd_ppid; sp->default_context = info.snd_context; } + if (info.snd_assoc_id == SCTP_CURRENT_ASSOC || + info.snd_assoc_id == SCTP_ALL_ASSOC) { + list_for_each_entry(asoc, &sp->ep->asocs, asocs) { + asoc->default_stream = info.snd_sid; + asoc->default_flags = info.snd_flags; + asoc->default_ppid = info.snd_ppid; + asoc->default_context = info.snd_context; + } + } + return 0; } @@ -6287,8 +6304,10 @@ static int sctp_getsockopt_default_sndinfo(struct sock *sk, int len, return -EFAULT; asoc = sctp_id2assoc(sk, info.snd_assoc_id); - if (!asoc && info.snd_assoc_id && sctp_style(sk, UDP)) + if (!asoc && info.snd_assoc_id != SCTP_FUTURE_ASSOC && + sctp_style(sk, UDP)) return -EINVAL; + if (asoc) { info.snd_sid = asoc->default_stream; info.snd_flags = asoc->default_flags; -- 2.1.0