Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e1d04e6 authored by Hannes Frederic Sowa's avatar Hannes Frederic Sowa Committed by David S. Miller
Browse files

net: introduce lockdep_is_held and update various places to use it 



The socket is either locked if we hold the slock spin_lock for
lock_sock_fast and unlock_sock_fast or we own the lock (sk_lock.owned
!= 0). Check for this and at the same time improve that the current
thread/cpu is really holding the lock.

Signed-off-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 61881cfb

include/net/sock.h

+10 −2
Original line number Diff line number Diff line
@@ -1360,6 +1360,14 @@ do { \ 
	lockdep_init_map(&(sk)->sk_lock.dep_map, (name), (key), 0);	\

} while (0)



static bool lockdep_sock_is_held(const struct sock *csk)

{

	struct sock *sk = (struct sock *)csk;



	return lockdep_is_held(&sk->sk_lock) ||

	       lockdep_is_held(&sk->sk_lock.slock);

}



void lock_sock_nested(struct sock *sk, int subclass);



static inline void lock_sock(struct sock *sk)
@@ -1598,8 +1606,8 @@ static inline void sk_rethink_txhash(struct sock *sk) 
static inline struct dst_entry *

__sk_dst_get(struct sock *sk)

{

	return rcu_dereference_check(sk->sk_dst_cache, sock_owned_by_user(sk) ||

						       lockdep_is_held(&sk->sk_lock.slock));

	return rcu_dereference_check(sk->sk_dst_cache,

				     lockdep_sock_is_held(sk));

}



static inline struct dst_entry *

net/dccp/ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) 
	nexthop = daddr = usin->sin_addr.s_addr;



	inet_opt = rcu_dereference_protected(inet->inet_opt,

					     sock_owned_by_user(sk));

					     lockdep_sock_is_held(sk));

	if (inet_opt != NULL && inet_opt->opt.srr) {

		if (daddr == 0)

			return -EINVAL;

net/dccp/ipv6.c

+1 −1
Original line number Diff line number Diff line
@@ -868,7 +868,7 @@ static int dccp_v6_connect(struct sock *sk, struct sockaddr *uaddr, 
	fl6.fl6_sport = inet->inet_sport;

	security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));



	opt = rcu_dereference_protected(np->opt, sock_owned_by_user(sk));

	opt = rcu_dereference_protected(np->opt, lockdep_sock_is_held(sk));

	final_p = fl6_update_dst(&fl6, opt, &final);



	dst = ip6_dst_lookup_flow(sk, &fl6, final_p);

net/ipv4/af_inet.c

+1 −1
Original line number Diff line number Diff line
@@ -1107,7 +1107,7 @@ static int inet_sk_reselect_saddr(struct sock *sk) 
	struct ip_options_rcu *inet_opt;



	inet_opt = rcu_dereference_protected(inet->inet_opt,

					     sock_owned_by_user(sk));

					     lockdep_sock_is_held(sk));

	if (inet_opt && inet_opt->opt.srr)

		daddr = inet_opt->opt.faddr;

net/ipv4/cipso_ipv4.c

+2 −1
Original line number Diff line number Diff line
@@ -1933,7 +1933,8 @@ int cipso_v4_sock_setattr(struct sock *sk, 


	sk_inet = inet_sk(sk);



	old = rcu_dereference_protected(sk_inet->inet_opt, sock_owned_by_user(sk));

	old = rcu_dereference_protected(sk_inet->inet_opt,

					lockdep_sock_is_held(sk));

	if (sk_inet->is_icsk) {

		sk_conn = inet_csk(sk);

		if (old)