Skip to contentSkip to conversation

adsf

NETROM Ralf Baechle 2 participants 2 messages Jul 10, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

When establishing a new circuit in nr_rx_frame the locks are taken in a different order than in the rest of the stack. This should be harmless but triggers lockdep. Either way, reordering the code a little solves the issue.

net/netrom/af_netrom.c +6 -6
index ecc7968..672d5f8 100644
@@ -986,18 +986,18 @@ int nr_rx_frame(struct sk_buff *skb, str
 	nr_make->vl        = 0;
 	nr_make->state     = NR_STATE_3;
 	sk_acceptq_added(sk);
-
-	nr_insert_socket(make);
-
 	skb_queue_head(&sk->sk_receive_queue, skb);
 
-	nr_start_heartbeat(make);
-	nr_start_idletimer(make);
-
 	if (!sock_flag(sk, SOCK_DEAD))
 		sk->sk_data_ready(sk, skb->len);
 
 	bh_unlock_sock(sk);
+
+	nr_insert_socket(make);
+
+	nr_start_heartbeat(make);
+	nr_start_idletimer(make);
+
 	return 1;
 }
 
maintainer
#1 lore raw

From: Ralf Baechle <[email protected]>
Date: Tue, 11 Jul 2006 00:14:46 +0100

Quoted 6 lines

When establishing a new circuit in nr_rx_frame the locks are taken in a different order than in the rest of the stack. This should be harmless but triggers lockdep. Either way, reordering the code a little solves the issue.

Care to give me a better header line than "[NETROM]: adsf"? :-)

Thanks.