From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 7E1D917727; Mon, 27 May 2024 19:31:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716838266; cv=none; b=dj4it2BTMka01POkH4fNHZirBPYig1jkEEyxwEl2ZalGtc30S3/HVKWXoRfPjVDego4BgTm3B7tKFlEd/9uCfRw+dIZDQE9mnLuzioTMZT4QRbvBlczx42RLmuElogXKopPXaBhgnao5l4xT7TYxUCP64iYinIIYw5YetsxCEis= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716838266; c=relaxed/simple; bh=0KmV1MEVUDKMGb9I1PKWAGxe5ek/RVZ7mDnxlk0wvqE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e+LghTQXE9d45DGO9Ur0nuTU8L4CC7LHDGuLj+gIJddHimcUB1fMSKrdAXqtO+8kvFdhVB/3MQiME1d4s2vNfM7kbj9II5EPH0gcwRYTq3Nkk2+u6G6LScdqEmNDMxXkqg2IZFBUWvu8y6Jqj/HU9k5gFy8C3R5Pjkxk2X/kl90= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=jIK5JpgO; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="jIK5JpgO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 13D35C2BBFC; Mon, 27 May 2024 19:31:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1716838266; bh=0KmV1MEVUDKMGb9I1PKWAGxe5ek/RVZ7mDnxlk0wvqE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jIK5JpgOKGcWz3YoQPHoyp6+He+FutFVfTi6a17dXoIOjYCuqFMCf+xwudg9ecfg8 A7HvWdVRNmp4bvprx5iWuOZF3tzY0s1Uul56m9xDEN8LFHFumd5Fxvv3R8qG4t6Nwv EA0BCeKrs+8fLxEN3USZ67Y9RtB8CCVkilURrk1M= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Paolo Abeni , Mat Martineau , "Matthieu Baerts (NGI0)" , "David S. Miller" , Sasha Levin Subject: [PATCH 6.8 328/493] mptcp: avoid some duplicate code in socket option handling Date: Mon, 27 May 2024 20:55:30 +0200 Message-ID: <20240527185641.002331403@linuxfoundation.org> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240527185626.546110716@linuxfoundation.org> References: <20240527185626.546110716@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.8-stable review patch. If anyone has any objections, please let me know. ------------------ From: Paolo Abeni [ Upstream commit a74762675f700a5473ebe54a671a0788a5b23cc9 ] The mptcp_get_int_option() helper is needless open-coded in a couple of places, replace the duplicate code with the helper call. Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) Signed-off-by: David S. Miller Stable-dep-of: bd11dc4fb969 ("mptcp: fix full TCP keep-alive support") Signed-off-by: Sasha Levin --- net/mptcp/sockopt.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index f361d02f94b7e..82d0cd0819f09 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -627,13 +627,11 @@ static int mptcp_setsockopt_sol_tcp_cork(struct mptcp_sock *msk, sockptr_t optva { struct mptcp_subflow_context *subflow; struct sock *sk = (struct sock *)msk; - int val; - - if (optlen < sizeof(int)) - return -EINVAL; + int val, ret; - if (copy_from_sockptr(&val, optval, sizeof(val))) - return -EFAULT; + ret = mptcp_get_int_option(msk, optval, optlen, &val); + if (ret) + return ret; lock_sock(sk); sockopt_seq_inc(msk); @@ -657,13 +655,11 @@ static int mptcp_setsockopt_sol_tcp_nodelay(struct mptcp_sock *msk, sockptr_t op { struct mptcp_subflow_context *subflow; struct sock *sk = (struct sock *)msk; - int val; - - if (optlen < sizeof(int)) - return -EINVAL; + int val, ret; - if (copy_from_sockptr(&val, optval, sizeof(val))) - return -EFAULT; + ret = mptcp_get_int_option(msk, optval, optlen, &val); + if (ret) + return ret; lock_sock(sk); sockopt_seq_inc(msk); -- 2.43.0