af_irda.c cleanups
Subsystems (2)
PATCH 1/3 af_irda.c cleanups
Hi Dave,
We lock the socket when both releasing and getting a disconnected notification. In the latter case, we also ste the socket as orphan. This fixes a potential kernel bug that can be triggered when we get the disconnection notification before closing the socket.
--- net/irda/af_irda.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)
net/irda/af_irda.c +7 -2
@@ -132,13 +132,14 @@ static void irda_disconnect_indication(v/* Prevent race conditions with irda_release() and irda_shutdown() */ if (!sock_flag (sk,SOCK_DEAD ) && sk->sk_state !=TCP_CLOSE ) { +lock_sock (sk); sk->sk_state =TCP_CLOSE ; sk->sk_err =ECONNRESET ; sk->sk_shutdown |=SEND_SHUTDOWN ; sk->sk_state_change (sk); -/* Uh-oh... Should use sock_orphan ? */ -sock_set_flag (sk,SOCK_DEAD ); +sock_orphan (sk); +release_sock (sk);/* Close our TSAP. * If we leave it open, IrLMP put it back into the list of
@@ -1212,6 +1213,7 @@ static int irda_release(struct socket *sif (sk ==NULL )return 0 ; +lock_sock (sk); sk->sk_state =TCP_CLOSE ; sk->sk_shutdown |=SEND_SHUTDOWN ; sk->sk_state_change (sk);
@@ -1221,6 +1223,7 @@ static int irda_release(struct socket *ssock_orphan (sk); sock->sk =NULL ; +release_sock (sk);/* Purge queues (see sock_init_data()) */ skb_queue_purge (&sk->sk_receive_queue);
@@ -1353,6 +1356,7 @@ static int irda_recvmsg_dgram(struct kioIRDA_DEBUG (4 ,"%s()\n" , __FUNCTION__); IRDA_ASSERT(self != NULL, return -1;); + IRDA_ASSERT(!sock_error(sk), return -1;); skb =skb_recv_datagram (sk, flags & ~MSG_DONTWAIT , flags &MSG_DONTWAIT , &err);
@@ -1405,6 +1409,7 @@ static int irda_recvmsg_stream(struct kiIRDA_DEBUG (3 ,"%s()\n" , __FUNCTION__); IRDA_ASSERT(self != NULL, return -1;); + IRDA_ASSERT(!sock_error(sk), return -1;);if (sock->flags & __SO_ACCEPTCON)return (-EINVAL );
Signature · 1 line
1.4.1.1
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 8 lines · Samuel Ortiz
Hi Dave,
We lock the socket when both releasing and getting a disconnected notification. In the latter case, we also ste the socket as orphan. This fixes a potential kernel bug that can be triggered when we get the disconnection notification before closing the socket.
Signed-off-by Samuel Ortiz <[email protected]>
Yes, all those changes look good to me. Go for it !
Jean
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
David Miller
AppliedFrom: Samuel Ortiz <[email protected]>
Date: Mon, 11 Sep 2006 08:46:36 +0300
Quoted 6 lines
We lock the socket when both releasing and getting a disconnected notification. In the latter case, we also ste the socket as orphan. This fixes a potential kernel bug that can be triggered when we get the disconnection notification before closing the socket.
Signed-off-by Samuel Ortiz <[email protected]>
Applied, sorry for taking so long :)
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV