diff options
author | Eric Dumazet <edumazet@google.com> | 2019-07-18 22:28:14 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-07-18 23:33:48 -0400 |
commit | 8d650cdedaabb33e85e9b7c517c0c71fcecc1de9 (patch) | |
tree | ab0428e5e973eb2b4e8b1f4859a508e2c0d07859 /net/ipv4/tcp.c | |
parent | 269b7c5ff78264e3728b95828d219e0e0eeaec94 (diff) |
tcp: fix tcp_set_congestion_control() use from bpf hook
Neal reported incorrect use of ns_capable() from bpf hook.
bpf_setsockopt(...TCP_CONGESTION...)
-> tcp_set_congestion_control()
-> ns_capable(sock_net(sk)->user_ns, CAP_NET_ADMIN)
-> ns_capable_common()
-> current_cred()
-> rcu_dereference_protected(current->cred, 1)
Accessing 'current' in bpf context makes no sense, since packets
are processed from softirq context.
As Neal stated : The capability check in tcp_set_congestion_control()
was written assuming a system call context, and then was reused from
a BPF call site.
The fix is to add a new parameter to tcp_set_congestion_control(),
so that the ns_capable() call is only performed under the right
context.
Fixes: 91b5b21c7c16 ("bpf: Add support for changing congestion control")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Lawrence Brakmo <brakmo@fb.com>
Reported-by: Neal Cardwell <ncardwell@google.com>
Acked-by: Neal Cardwell <ncardwell@google.com>
Acked-by: Lawrence Brakmo <brakmo@fb.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp.c')
-rw-r--r-- | net/ipv4/tcp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 7846afacdf0b..776905899ac0 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
@@ -2785,7 +2785,9 @@ static int do_tcp_setsockopt(struct sock *sk, int level, | |||
2785 | name[val] = 0; | 2785 | name[val] = 0; |
2786 | 2786 | ||
2787 | lock_sock(sk); | 2787 | lock_sock(sk); |
2788 | err = tcp_set_congestion_control(sk, name, true, true); | 2788 | err = tcp_set_congestion_control(sk, name, true, true, |
2789 | ns_capable(sock_net(sk)->user_ns, | ||
2790 | CAP_NET_ADMIN)); | ||
2789 | release_sock(sk); | 2791 | release_sock(sk); |
2790 | return err; | 2792 | return err; |
2791 | } | 2793 | } |