]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
net: lockless SO_PASSCRED, SO_PASSPIDFD and SO_PASSSEC
authorEric Dumazet <edumazet@google.com>
Thu, 21 Sep 2023 20:28:12 +0000 (20:28 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sun, 1 Oct 2023 18:09:54 +0000 (19:09 +0100)
sock->flags are atomic, no need to hold the socket lock
in sk_setsockopt() for SO_PASSCRED, SO_PASSPIDFD and SO_PASSSEC.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/sock.c

index 1fdc0a0d8ff2fb2342618677c3adef2b485c6776..f01c757245683452fd6c30c51b885d09427ef697 100644 (file)
@@ -1126,6 +1126,15 @@ int sk_setsockopt(struct sock *sk, int level, int optname,
                        return 0;
                }
                return -EPERM;
+       case SO_PASSSEC:
+               assign_bit(SOCK_PASSSEC, &sock->flags, valbool);
+               return 0;
+       case SO_PASSCRED:
+               assign_bit(SOCK_PASSCRED, &sock->flags, valbool);
+               return 0;
+       case SO_PASSPIDFD:
+               assign_bit(SOCK_PASSPIDFD, &sock->flags, valbool);
+               return 0;
        }
 
        sockopt_lock_sock(sk);
@@ -1248,14 +1257,6 @@ set_sndbuf:
        case SO_BSDCOMPAT:
                break;
 
-       case SO_PASSCRED:
-               assign_bit(SOCK_PASSCRED, &sock->flags, valbool);
-               break;
-
-       case SO_PASSPIDFD:
-               assign_bit(SOCK_PASSPIDFD, &sock->flags, valbool);
-               break;
-
        case SO_TIMESTAMP_OLD:
        case SO_TIMESTAMP_NEW:
        case SO_TIMESTAMPNS_OLD:
@@ -1361,9 +1362,6 @@ set_sndbuf:
                        sock_valbool_flag(sk, SOCK_FILTER_LOCKED, valbool);
                break;
 
-       case SO_PASSSEC:
-               assign_bit(SOCK_PASSSEC, &sock->flags, valbool);
-               break;
        case SO_MARK:
                if (!sockopt_ns_capable(sock_net(sk)->user_ns, CAP_NET_RAW) &&
                    !sockopt_ns_capable(sock_net(sk)->user_ns, CAP_NET_ADMIN)) {