diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-06-22 18:40:38 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-06-22 18:40:38 -0700 |
| commit | a7384f3918756c193e3fcd7e3111fc4bd3686013 (patch) | |
| tree | 156fda862edf0154225e6a5d8d092b0f6fe35728 /net/core | |
| parent | 98e95872f2b818c74872d073eaa4c937579d41fc (diff) | |
| parent | 8a28a0b6f1a1dcbf5a834600a9acfbe2ba51e5eb (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
Conflicts:
tools/testing/selftests/net/fcnal-test.sh
d7a2fc1437f7 ("selftests: net: fcnal-test: check if FIPS mode is enabled")
dd017c72dde6 ("selftests: fcnal: Test SO_DONTROUTE on TCP sockets.")
https://lore.kernel.org/all/5007b52c-dd16-dbf6-8d64-b9701bfa498b@tessares.net/
https://lore.kernel.org/all/20230619105427.4a0df9b3@canb.auug.org.au/
No adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/sock.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 8ec8f4c9911f..5f1747c12004 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1373,12 +1373,6 @@ set_sndbuf: __sock_set_mark(sk, val); break; case SO_RCVMARK: - if (!sockopt_ns_capable(sock_net(sk)->user_ns, CAP_NET_RAW) && - !sockopt_ns_capable(sock_net(sk)->user_ns, CAP_NET_ADMIN)) { - ret = -EPERM; - break; - } - sock_valbool_flag(sk, SOCK_RCVMARK, valbool); break; |