]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[IrDA]: Correctly handling socket error
authorOlaf Kirch <olaf.kirch@oracle.com>
Wed, 18 Apr 2007 22:07:22 +0000 (15:07 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 Apr 2007 22:07:22 +0000 (15:07 -0700)
This patch fixes an oops first reported in mid 2006 - see
http://lkml.org/lkml/2006/8/29/358 The cause of this bug report is that
when an error is signalled on the socket, irda_recvmsg_stream returns
without removing a local wait_queue variable from the socket's sk_sleep
queue. This causes havoc further down the road.

In response to this problem, a patch was made that invoked sock_orphan on
the socket when receiving a disconnect indication. This is not a good fix,
as this sets sk_sleep to NULL, causing applications sleeping in recvmsg
(and other places) to oops.

This is against the latest net-2.6 and should be considered for -stable
inclusion.

Signed-off-by: Olaf Kirch <olaf.kirch@oracle.com>
Signed-off-by: Samuel Ortiz <samuel@sortiz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/irda/af_irda.c

index eabd6838f50a2e811888d22499e31ab90ae55af8..0eb7d596d4703cd3f773c529b6888eaad5172b48 100644 (file)
@@ -138,7 +138,6 @@ static void irda_disconnect_indication(void *instance, void *sap,
                sk->sk_shutdown |= SEND_SHUTDOWN;
 
                sk->sk_state_change(sk);
-               sock_orphan(sk);
                release_sock(sk);
 
                /* Close our TSAP.
@@ -1446,7 +1445,7 @@ static int irda_recvmsg_stream(struct kiocb *iocb, struct socket *sock,
                         */
                        ret = sock_error(sk);
                        if (ret)
-                               break;
+                               ;
                        else if (sk->sk_shutdown & RCV_SHUTDOWN)
                                ;
                        else if (noblock)