[MPTCP] Re: [PATCH mptcp-next] Squash to "mptcp: only admit explicitly supported sockopt"

[Paolo Abeni <pabeni at redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 1268 bytes --]

On Thu, 2021-03-11 at 11:11 +0100, Matthieu Baerts wrote:
> SO_SNDTIMEO_{OLD,NEW} were missing in the list. They are considered as
> "quite common but need a better implementation".
> 
> Indeed, as mentioned by Paolo: these settings are applied only to the
> first subflow, while mptcp_recvmsg()/mptcp_sendmsg() will look for the
> timeout value in the msk socket.
> 
> At least with these patches, we can have MPTCP BPF selftest passing:
> 
>   ./test_progs -n 66
> 
> Reported-and-tested-by: Geliang Tang <geliangtang(a)gmail.com>
> Signed-off-by: Matthieu Baerts <matthieu.baerts(a)tessares.net>
> ---
> 
> Notes:
>     to be squashed in "mptcp: only admit explicitly supported sockopt"
> 
>  net/mptcp/sockopt.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c
> index 3eda9127debb..fb98fab252df 100644
> --- a/net/mptcp/sockopt.c
> +++ b/net/mptcp/sockopt.c
> @@ -110,6 +110,8 @@ static bool mptcp_supported_sockopt(int level, int optname)
>  		case SO_RCVLOWAT:
>  		case SO_RCVTIMEO_OLD:
>  		case SO_RCVTIMEO_NEW:
> +		case SO_SNDTIMEO_OLD:
> +		case SO_SNDTIMEO_NEW:
>  		case SO_MARK:
>  		case SO_INCOMING_CPU:
>  		case SO_BINDTOIFINDEX:

LGTM! 

Thanks,

Paolo