mptcp: setsockopt: SO_DEBUG and no-op options

Handle SO_DEBUG and set it on all subflows.
Ignore those values not implemented on TCP sockets.

Acked-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c
index 7eb637488dc20e7894077460c9a4843916233bd3..390433b7f324bee8add63e0c0e42f0e618153c8a 100644 (file)
--- a/net/mptcp/sockopt.c
+++ b/net/mptcp/sockopt.c
@@ -77,6 +77,9 @@ static void mptcp_sol_socket_sync_intval(struct mptcp_sock *msk, int optname, in
                bool slow = lock_sock_fast(ssk);
 
                switch (optname) {
+               case SO_DEBUG:
+                       sock_valbool_flag(ssk, SOCK_DBG, !!val);
+                       break;
                case SO_KEEPALIVE:
                        if (ssk->sk_prot->keepalive)
                                ssk->sk_prot->keepalive(ssk, !!val);
@@ -150,6 +153,7 @@ static int mptcp_setsockopt_sol_socket_int(struct mptcp_sock *msk, int optname,
        case SO_KEEPALIVE:
                mptcp_sol_socket_sync_intval(msk, optname, val);
                return 0;
+       case SO_DEBUG:
        case SO_MARK:
        case SO_PRIORITY:
        case SO_SNDBUF:
@@ -246,9 +250,21 @@ static int mptcp_setsockopt_sol_socket(struct mptcp_sock *msk, int optname,
        case SO_RCVBUFFORCE:
        case SO_MARK:
        case SO_INCOMING_CPU:
+       case SO_DEBUG:
                return mptcp_setsockopt_sol_socket_int(msk, optname, optval, optlen);
        case SO_LINGER:
                return mptcp_setsockopt_sol_socket_linger(msk, optval, optlen);
+       case SO_NO_CHECK:
+       case SO_DONTROUTE:
+       case SO_BROADCAST:
+       case SO_BSDCOMPAT:
+       case SO_PASSCRED:
+       case SO_PASSSEC:
+       case SO_RXQ_OVFL:
+       case SO_WIFI_STATUS:
+       case SO_NOFCS:
+       case SO_SELECT_ERR_QUEUE:
+               return 0;
        }
 
        return sock_setsockopt(sk->sk_socket, SOL_SOCKET, optname, optval, optlen);