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 01FD8144D36; Thu, 13 Jun 2024 12:05:20 +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=1718280321; cv=none; b=hnb/yfZGKr9PSbiDhyY2I5aEyZo80iaZ92Lm9RhIH2IIgWhT9vhuWn3O+8b21XJbTEiGX/tdd21Fv6wEiJpIadJOcSsMdEOeEhHEd/bTf30DpBXYKTAjE4ea9SWHZ0+gH5cpeYcN+PtvyP/acMP3OGDylRrGmJ/hyPTHMJ5XvI0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718280321; c=relaxed/simple; bh=wxBraw0qe268jMxfb76bPqvNsYlUFQ1GJRj1nYOx8nI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cRVVlUwTBTaKW4SH0z1wB0LsT5IP0aXdMb1HqJuidT0Sferlys7Pnqsh4XU/Y25qTmTEMDP6ZGjsKxkfkfKeHUieBrFpbe3a8DVLXPsbKsYSDmtAQz+96h7ePH4sITN4OIVgZTKfIk+0gjVgu43fYUdbJjQWXTn8Giqmb7l8WoE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=r2/kNmiM; 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="r2/kNmiM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33C31C32786; Thu, 13 Jun 2024 12:05:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1718280320; bh=wxBraw0qe268jMxfb76bPqvNsYlUFQ1GJRj1nYOx8nI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r2/kNmiM2Sz2a1zZVUDW6G0kTSagesZQbUKn0Io4eG/+PqoQBJmOLFCsguiCfOeeg E9AK4HguAXjlbfsRtQNNDaNMgMXQ6dphIldbex8wIT3c4zxfLqyKZIci6V5vr/GmBk YU9C3sivmZjJqoxe8nGicvXQa+RNW05IQX/q3Gfc= 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" Subject: [PATCH 6.6 006/137] mptcp: avoid some duplicate code in socket option handling Date: Thu, 13 Jun 2024 13:33:06 +0200 Message-ID: <20240613113223.530809723@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240613113223.281378087@linuxfoundation.org> References: <20240613113223.281378087@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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Paolo Abeni commit a74762675f700a5473ebe54a671a0788a5b23cc9 upstream. 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: Matthieu Baerts (NGI0) Signed-off-by: Greg Kroah-Hartman --- net/mptcp/sockopt.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -626,13 +626,11 @@ static int mptcp_setsockopt_sol_tcp_cork { struct mptcp_subflow_context *subflow; struct sock *sk = (struct sock *)msk; - int val; + int val, ret; - if (optlen < sizeof(int)) - return -EINVAL; - - 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); @@ -656,13 +654,11 @@ static int mptcp_setsockopt_sol_tcp_node { 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);