* [PATCH] Fix ax25_get_socket locking
@ 2005-03-14 8:37 Ralf Baechle DL5RB
2005-03-15 5:30 ` David S. Miller
0 siblings, 1 reply; 2+ messages in thread
From: Ralf Baechle DL5RB @ 2005-03-14 8:37 UTC (permalink / raw)
To: netdev, linux-hams; +Cc: David S. Miller
In an attempt to return a locked socket ax25_get_socket() was calling
lock_sock() with a spinlock held, bad idea. Making matters worse it's
only user is running in bottom half context resulting in a potencial
attempt to sleep in bottom half context, so fix the locking there as well.
Index: bk-afu/net/ax25/ax25_in.c
===================================================================
--- bk-afu.orig/net/ax25/ax25_in.c 2005-03-14 00:20:42.153164936 +0000
+++ bk-afu/net/ax25/ax25_in.c 2005-03-14 00:21:07.469316296 +0000
@@ -275,6 +275,7 @@
/* Now find a suitable dgram socket */
sk = ax25_get_socket(&dest, &src, SOCK_DGRAM);
if (sk != NULL) {
+ bh_lock_sock(sk);
if (atomic_read(&sk->sk_rmem_alloc) >=
sk->sk_rcvbuf) {
kfree_skb(skb);
@@ -286,7 +287,8 @@
if (sock_queue_rcv_skb(sk, skb) != 0)
kfree_skb(skb);
}
- release_sock(sk);
+ bh_unlock_sock(sk);
+ sock_put(sk);
} else {
kfree_skb(skb);
}
Index: bk-afu/net/ax25/af_ax25.c
===================================================================
--- bk-afu.orig/net/ax25/af_ax25.c 2005-03-14 00:21:03.757880520 +0000
+++ bk-afu/net/ax25/af_ax25.c 2005-03-14 00:21:07.471315992 +0000
@@ -180,8 +180,7 @@
!ax25cmp(&s->dest_addr, dest_addr) &&
s->sk->sk_type == type) {
sk = s->sk;
- /* XXX Sleeps with spinlock held, use refcounts instead. XXX */
- lock_sock(sk);
+ sock_hold(sk);
break;
}
}
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] Fix ax25_get_socket locking
2005-03-14 8:37 [PATCH] Fix ax25_get_socket locking Ralf Baechle DL5RB
@ 2005-03-15 5:30 ` David S. Miller
0 siblings, 0 replies; 2+ messages in thread
From: David S. Miller @ 2005-03-15 5:30 UTC (permalink / raw)
To: Ralf Baechle DL5RB; +Cc: netdev, linux-hams
On Mon, 14 Mar 2005 08:37:44 +0000
Ralf Baechle DL5RB <ralf@linux-mips.org> wrote:
> In an attempt to return a locked socket ax25_get_socket() was calling
> lock_sock() with a spinlock held, bad idea. Making matters worse it's
> only user is running in bottom half context resulting in a potencial
> attempt to sleep in bottom half context, so fix the locking there as well.
Looks fine. Applied, thanks Ralf.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2005-03-15 5:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-03-14 8:37 [PATCH] Fix ax25_get_socket locking Ralf Baechle DL5RB
2005-03-15 5:30 ` David S. Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).