Commit cb388e7e authored by Martin KaFai Lau's avatar Martin KaFai Lau Committed by Alexei Starovoitov
Browse files

bpf: net: Change do_tcp_setsockopt() to use the sockopt's lock_sock() and capable() 



Similar to the earlier patch that avoids sk_setsockopt() from
taking sk lock and doing capable test when called by bpf.  This patch
changes do_tcp_setsockopt() to use the sockopt_{lock,release}_sock()
and sockopt_[ns_]capable().

Reviewed-by: default avatarStanislav Fomichev <sdf@google.com>
Signed-off-by: default avatarMartin KaFai Lau <kafai@fb.com>
Link: https://lore.kernel.org/r/20220817061730.4176021-1-kafai@fb.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent e42c7bee

net/ipv4/tcp.c

+9 −9
Original line number Diff line number Diff line
@@ -3202,7 +3202,7 @@ EXPORT_SYMBOL(tcp_disconnect); 


static inline bool tcp_can_repair_sock(const struct sock *sk)

{

	return ns_capable(sock_net(sk)->user_ns, CAP_NET_ADMIN) &&

	return sockopt_ns_capable(sock_net(sk)->user_ns, CAP_NET_ADMIN) &&

		(sk->sk_state != TCP_LISTEN);

}
@@ -3502,11 +3502,11 @@ static int do_tcp_setsockopt(struct sock *sk, int level, int optname, 
			return -EFAULT;

		name[val] = 0;



		lock_sock(sk);

		sockopt_lock_sock(sk);

		err = tcp_set_congestion_control(sk, name, true,

						 ns_capable(sock_net(sk)->user_ns,

						 sockopt_ns_capable(sock_net(sk)->user_ns,

								    CAP_NET_ADMIN));

		release_sock(sk);

		sockopt_release_sock(sk);

		return err;

	}

	case TCP_ULP: {
@@ -3522,9 +3522,9 @@ static int do_tcp_setsockopt(struct sock *sk, int level, int optname, 
			return -EFAULT;

		name[val] = 0;



		lock_sock(sk);

		sockopt_lock_sock(sk);

		err = tcp_set_ulp(sk, name);

		release_sock(sk);

		sockopt_release_sock(sk);

		return err;

	}

	case TCP_FASTOPEN_KEY: {
@@ -3557,7 +3557,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level, int optname, 
	if (copy_from_sockptr(&val, optval, sizeof(val)))

		return -EFAULT;



	lock_sock(sk);

	sockopt_lock_sock(sk);



	switch (optname) {

	case TCP_MAXSEG:
@@ -3779,7 +3779,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level, int optname, 
		break;

	}



	release_sock(sk);

	sockopt_release_sock(sk);

	return err;

}