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

Commit 640c41c7 authored by Ingo Molnar's avatar Ingo Molnar Committed by David S. Miller
Browse files

[IPV6] lockdep: annotate __icmpv6_socket 



Split off __icmpv6_socket's sk->sk_dst_lock class, because it gets
used from softirqs, which is safe for __icmpv6_sockets (because they
never get directly used via userspace syscalls), but unsafe for normal
sockets.

Has no effect on non-lockdep kernels.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Acked-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent deb47c66

net/ipv6/icmp.c

+13 −0
Original line number Diff line number Diff line
@@ -712,6 +712,11 @@ static int icmpv6_rcv(struct sk_buff **pskb) 
	return 0;

}



/*

 * Special lock-class for __icmpv6_socket:

 */

static struct lock_class_key icmpv6_socket_sk_dst_lock_key;



int __init icmpv6_init(struct net_proto_family *ops)

{

	struct sock *sk;
@@ -730,6 +735,14 @@ int __init icmpv6_init(struct net_proto_family *ops) 


		sk = per_cpu(__icmpv6_socket, i)->sk;

		sk->sk_allocation = GFP_ATOMIC;

		/*

		 * Split off their lock-class, because sk->sk_dst_lock

		 * gets used from softirqs, which is safe for

		 * __icmpv6_socket (because those never get directly used

		 * via userspace syscalls), but unsafe for normal sockets.

		 */

		lockdep_set_class(&sk->sk_dst_lock,

				  &icmpv6_socket_sk_dst_lock_key);



		/* Enough space for 2 64K ICMP packets, including

		 * sk_buff struct overhead.