From nobody Mon Feb 9 16:50:46 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:cbb9:0:0:0:0:0 with SMTP id v25csp1110670jap; Fri, 3 Dec 2021 14:35:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJxraGSspq7Srf/ADFdyrrLw66iJwyLdHY0lnHYRmCwZ4p46vKRdp9MfwJ/c2P9zgO2aNxmM X-Received: by 2002:aa7:9acc:0:b0:4a2:b8b5:8813 with SMTP id x12-20020aa79acc000000b004a2b8b58813mr21948717pfp.4.1638570958010; Fri, 03 Dec 2021 14:35:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638570958; cv=none; d=google.com; s=arc-20160816; b=opGeq9g826orrQQYX0RrDAubZDTxIUhpboAJnu7lYGcL57HpYrqqG4THs0qyguGHfp y2xq2fPCm/CPw9fASMCEPLnhsmO+f3naokFKiODla+6hA+nTFPXKY2FNQ4G5S9iZTxuM NdorX/jsIQus1WqNbKha5FU31zuFKYhENcrVLIoWwnl6l7X2klf3fazeUkz833yYIvEy u3YVB3NkiPEfJaP10ISUCz3Ic/NkzIPpIane++zJx2fXtGaerHMqaa1PRZfX86DYBpr3 81zNZhTkoTMMf95BJlrK8sw2aoDVaH10jj8gSEq33zdk3Mp5uLJNq3JEa0BNpppU9JXh umCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=nzFXckPcLpzkP+F8tYKDQL0I2DWo2QpVkZOc2jsntpA=; b=YTLaFiDitkY6EFEHVv4VaLfWdsVoScLdefkhEd49bh72nvNO59dVqHQnL1lYIczWoW Iy2MnElU3b9GQZzAryHhH7vDb6ii8crs+ocAc1VeAlfgENq3734n0/t53mIniJIuTERF 8uDCKu2rCdb5G2hKEnp2ClcFRyuh86E0YpidmMvl0y6DmsRTQCNR4gpCm+d7+J26JEUm 9rhxTjM2w76wmU/nsP/xYWTyQ96lbv0wIuDyIY5/m3Ghvn4dUxuREnBk9OiGT9FU7KO9 RJCfxLtslxA/KQ2PO8iVnozE67RiFTCO4oA27+0tQRJgk/YTWRHGNj5n2nVXSujmUmQz hJvg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mptcp+bounces-2630-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2630-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id s2si5963324pgq.103.2021.12.03.14.35.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Dec 2021 14:35:58 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2630-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of mptcp+bounces-2630-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2630-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sjc.edge.kernel.org (Postfix) with ESMTPS id BD4DF3E0F63 for ; Fri, 3 Dec 2021 22:35:57 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8841F2CAC; Fri, 3 Dec 2021 22:35:52 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 732352C9D for ; Fri, 3 Dec 2021 22:35:51 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10187"; a="235802946" X-IronPort-AV: E=Sophos;i="5.87,284,1631602800"; d="scan'208";a="235802946" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Dec 2021 14:35:47 -0800 X-IronPort-AV: E=Sophos;i="5.87,284,1631602800"; d="scan'208";a="460185310" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.251.18.88]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Dec 2021 14:35:47 -0800 From: Mat Martineau To: netdev@vger.kernel.org Cc: Florian Westphal , davem@davemloft.net, kuba@kernel.org, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net-next 06/10] mptcp: getsockopt: add support for IP_TOS Date: Fri, 3 Dec 2021 14:35:37 -0800 Message-Id: <20211203223541.69364-7-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211203223541.69364-1-mathew.j.martineau@linux.intel.com> References: <20211203223541.69364-1-mathew.j.martineau@linux.intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Florian Westphal earlier patch added IP_TOS setsockopt support, this allows to get the value set by earlier setsockopt. Extends mptcp_put_int_option to handle u8 input/output by adding required cast. Reviewed-by: Matthieu Baerts Signed-off-by: Florian Westphal Signed-off-by: Mat Martineau --- net/mptcp/sockopt.c | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index 11cda8629993..44e0a37c567c 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -1053,15 +1053,24 @@ static int mptcp_put_int_option(struct mptcp_sock *= msk, char __user *optval, =20 if (get_user(len, optlen)) return -EFAULT; - - len =3D min_t(unsigned int, len, sizeof(int)); if (len < 0) return -EINVAL; =20 - if (put_user(len, optlen)) - return -EFAULT; - if (copy_to_user(optval, &val, len)) - return -EFAULT; + if (len < sizeof(int) && len > 0 && val >=3D 0 && val <=3D 255) { + unsigned char ucval =3D (unsigned char)val; + + len =3D 1; + if (put_user(len, optlen)) + return -EFAULT; + if (copy_to_user(optval, &ucval, 1)) + return -EFAULT; + } else { + len =3D min_t(unsigned int, len, sizeof(int)); + if (put_user(len, optlen)) + return -EFAULT; + if (copy_to_user(optval, &val, len)) + return -EFAULT; + } =20 return 0; } @@ -1082,6 +1091,19 @@ static int mptcp_getsockopt_sol_tcp(struct mptcp_soc= k *msk, int optname, return -EOPNOTSUPP; } =20 +static int mptcp_getsockopt_v4(struct mptcp_sock *msk, int optname, + char __user *optval, int __user *optlen) +{ + struct sock *sk =3D (void *)msk; + + switch (optname) { + case IP_TOS: + return mptcp_put_int_option(msk, optval, optlen, inet_sk(sk)->tos); + } + + return -EOPNOTSUPP; +} + static int mptcp_getsockopt_sol_mptcp(struct mptcp_sock *msk, int optname, char __user *optval, int __user *optlen) { @@ -1117,6 +1139,8 @@ int mptcp_getsockopt(struct sock *sk, int level, int = optname, if (ssk) return tcp_getsockopt(ssk, level, optname, optval, option); =20 + if (level =3D=3D SOL_IP) + return mptcp_getsockopt_v4(msk, optname, optval, option); if (level =3D=3D SOL_TCP) return mptcp_getsockopt_sol_tcp(msk, optname, optval, option); if (level =3D=3D SOL_MPTCP) --=20 2.34.1