Re: [PATCH 5.15.y] mptcp: sockopt: fix getting IPV6_V6ONLY

[Sasha Levin <sashal@kernel.org>]

[ Sasha's backport helper bot ]

Hi,

✅ All tests passed successfully. No issues detected.
No action required from the submitter.

The upstream commit SHA1 provided is correct: 8c39633759885b6ff85f6d96cf445560e74df5e8

Status in newer kernel trees:
6.14.y | Present (different SHA1: 233afced24eb)
6.13.y | Present (different SHA1: 41e890efe9aa)
6.12.y | Present (different SHA1: acc1f6a05ab2)
6.6.y | Present (different SHA1: 51893ff3b0f8)
6.1.y | Present (different SHA1: 0fb46064c253)

Note: The patch differs from the upstream commit:
---
1:  8c39633759885 ! 1:  21b4c2929499d mptcp: sockopt: fix getting IPV6_V6ONLY
    @@ Metadata
      ## Commit message ##
         mptcp: sockopt: fix getting IPV6_V6ONLY
     
    +    commit 8c39633759885b6ff85f6d96cf445560e74df5e8 upstream.
    +
         When adding a socket option support in MPTCP, both the get and set parts
         are supposed to be implemented.
     
    @@ Commit message
         Reviewed-by: Simon Horman <horms@kernel.org>
         Link: https://patch.msgid.link/20250314-net-mptcp-fix-data-stream-corr-sockopt-v1-2-122dbb249db3@kernel.org
         Signed-off-by: Paolo Abeni <pabeni@redhat.com>
    +    [ Conflicts in sockopt.c in the context, because commit 3b1e21eb60e8
    +      ("mptcp: getsockopt: add support for IP_TOS") is not in this release.
    +      The conflicts are in the context, the new helper can be added without
    +      issue. It depends on mptcp_put_int_option() which has been added via
    +      another backport, see commit 874aae15fbef ("mptcp: fix full TCP
    +      keep-alive support"). ]
    +    Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
     
      ## net/mptcp/sockopt.c ##
    -@@ net/mptcp/sockopt.c: static int mptcp_getsockopt_v4(struct mptcp_sock *msk, int optname,
    +@@ net/mptcp/sockopt.c: static int mptcp_getsockopt_sol_tcp(struct mptcp_sock *msk, int optname,
      	return -EOPNOTSUPP;
      }
      
    @@ net/mptcp/sockopt.c: static int mptcp_getsockopt_v4(struct mptcp_sock *msk, int
     +	return -EOPNOTSUPP;
     +}
     +
    - static int mptcp_getsockopt_sol_mptcp(struct mptcp_sock *msk, int optname,
    - 				      char __user *optval, int __user *optlen)
    + int mptcp_getsockopt(struct sock *sk, int level, int optname,
    + 		     char __user *optval, int __user *option)
      {
     @@ net/mptcp/sockopt.c: int mptcp_getsockopt(struct sock *sk, int level, int optname,
    + 	if (ssk)
    + 		return tcp_getsockopt(ssk, level, optname, optval, option);
      
    - 	if (level == SOL_IP)
    - 		return mptcp_getsockopt_v4(msk, optname, optval, option);
     +	if (level == SOL_IPV6)
     +		return mptcp_getsockopt_v6(msk, optname, optval, option);
      	if (level == SOL_TCP)
      		return mptcp_getsockopt_sol_tcp(msk, optname, optval, option);
    - 	if (level == SOL_MPTCP)
    + 	return -EOPNOTSUPP;
---

Results of testing on various branches:

| Branch                    | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.15.y       |  Success    |  Success   |