Commit:     bfb6709d0b239af5e3ce5859aae926e1b79ba84b
Parent:     d0cf0d9940ef27b46fcbbd9e0cc8427c30fe05eb
Author:     Olaf Kirch <[EMAIL PROTECTED]>
AuthorDate: Wed Apr 18 15:07:22 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Apr 18 15:07:22 2007 -0700

    [IrDA]: Correctly handling socket error
    This patch fixes an oops first reported in mid 2006 - see 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
    Signed-off-by: Olaf Kirch <[EMAIL PROTECTED]>
    Signed-off-by: Samuel Ortiz <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
 net/irda/af_irda.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index eabd683..0eb7d59 100644
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -138,7 +138,6 @@ static void irda_disconnect_indication(void *instance, void 
                sk->sk_shutdown |= SEND_SHUTDOWN;
-               sock_orphan(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)
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to