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 75064C282C8 for ; Mon, 28 Jan 2019 07:09:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 35C0D20881 for ; Mon, 28 Jan 2019 07:09:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KLSXkeQL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726905AbfA1HJb (ORCPT ); Mon, 28 Jan 2019 02:09:31 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:42538 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726686AbfA1HJa (ORCPT ); Mon, 28 Jan 2019 02:09:30 -0500 Received: by mail-pl1-f193.google.com with SMTP id y1so7347986plp.9; Sun, 27 Jan 2019 23:09:30 -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=xXYjmL47W6Kx9qD7Op0Usdcs56MyEuZt+eGTOH4TQ7Y=; b=KLSXkeQLNqAoGSZyAJ84lX1NEDHWIbwm4j2Jc2WIT+/iWkYGGdgF0Ad47xTEc86Gxq nHzYY3RZ8Vz0ZyD51uq/zYzpuZPB2FgRAabJQoGlBrYNN2HMHa5UQZHGZvn1S1eMB5wo mj20/u25v3re45QsZEN/jHXuwDT/7iMXLATiXqqOAyFYQhSZIuwhLwf92zpoU3uQTgCU kQNhi13bYe4HApk0MByOh9S5Wff0M7XzwSpXffJcKVUVwbftFaMuWsMkZ1MFz7LQfUtm iDOQJMPbTopa4ii3wmhT/5j83j3J5v1G6coSJyEE2IZWaecc4Im+Nsp4VKEzacqJO+WY Epsw== 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=xXYjmL47W6Kx9qD7Op0Usdcs56MyEuZt+eGTOH4TQ7Y=; b=UJbCqRaNxPVQ6JVUVph30lqf51Ckun9ho1BBoZse6CdjwAtVyEhesQJQhgUdAAjkEB PUS/fQsxQYHomi6w/Kqony4A/f499Wh31nTq3svXG44FSJnC3Pyd56fwRagvCitWI9b3 YdUvqgryfLffleCQfwVMMwtRuFvjLxcH5BxQi89sTCmADC922ns1ahgYWIri0v8YesDo TD/L/zHzg/O8uXrt5axuOd4ML+7JNAfeMxisqCU8th+VBv1tSKPMCKMjxyOWgrB8V+5i np2fkTN/hrggJrfLh6RCAflPy7tqqpinkV1n2TClaWmQdP9k0xM/Ut4GAn6QFxueSgLo Pz6A== X-Gm-Message-State: AJcUuke5kfd8sKr1prNTfqIYNZ9uwj15VJkRrXQPj1jqVv6f5aIDNhVM jt7Dx+nVaPnKcbPliaXH1riZ+QoyzWA= X-Google-Smtp-Source: ALg8bN6Y2Lk0G0Bw/inmAJc1Y//+M8CLKNpnFhEMxGBq9x4PqjPlbdbk5gF0GcsTZEtlPXGETBi1mw== X-Received: by 2002:a17:902:5a5:: with SMTP id f34mr20765900plf.161.1548659370046; Sun, 27 Jan 2019 23:09:30 -0800 (PST) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id c13sm60451150pfe.93.2019.01.27.23.09.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Jan 2019 23:09:29 -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 05/24] sctp: use SCTP_FUTURE_ASSOC for SCTP_MAXSEG sockopt Date: Mon, 28 Jan 2019 15:08:27 +0800 Message-Id: X-Mailer: git-send-email 2.1.0 In-Reply-To: <088bc37947694e4e80302b075f767a7828ea4a05.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> In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Check with SCTP_FUTURE_ASSOC instead in sctp_set/getsockopt_maxseg, it's compatible with 0. Also check asoc_id early as other sctp setsockopts does. Signed-off-by: Xin Long --- net/sctp/socket.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index e505e18..f38c912 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3322,7 +3322,7 @@ static int sctp_setsockopt_maxseg(struct sock *sk, char __user *optval, unsigned current->comm, task_pid_nr(current)); if (copy_from_user(&val, optval, optlen)) return -EFAULT; - params.assoc_id = 0; + params.assoc_id = SCTP_FUTURE_ASSOC; } else if (optlen == sizeof(struct sctp_assoc_value)) { if (copy_from_user(¶ms, optval, optlen)) return -EFAULT; @@ -3332,6 +3332,9 @@ static int sctp_setsockopt_maxseg(struct sock *sk, char __user *optval, unsigned } asoc = sctp_id2assoc(sk, params.assoc_id); + if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC && + sctp_style(sk, UDP)) + return -EINVAL; if (val) { int min_len, max_len; @@ -3349,8 +3352,6 @@ static int sctp_setsockopt_maxseg(struct sock *sk, char __user *optval, unsigned asoc->user_frag = val; sctp_assoc_update_frag_point(asoc); } else { - if (params.assoc_id && sctp_style(sk, UDP)) - return -EINVAL; sp->user_frag = val; } @@ -6503,7 +6504,7 @@ static int sctp_getsockopt_maxseg(struct sock *sk, int len, "Use of int in maxseg socket option.\n" "Use struct sctp_assoc_value instead\n", current->comm, task_pid_nr(current)); - params.assoc_id = 0; + params.assoc_id = SCTP_FUTURE_ASSOC; } else if (len >= sizeof(struct sctp_assoc_value)) { len = sizeof(struct sctp_assoc_value); if (copy_from_user(¶ms, optval, len)) @@ -6512,7 +6513,8 @@ static int sctp_getsockopt_maxseg(struct sock *sk, int len, return -EINVAL; asoc = sctp_id2assoc(sk, params.assoc_id); - if (!asoc && params.assoc_id && sctp_style(sk, UDP)) + if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC && + sctp_style(sk, UDP)) return -EINVAL; if (asoc) -- 2.1.0