diff options
| author | Olaf Kirch <olaf.kirch@oracle.com> | 2007-04-18 15:07:22 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-04-18 15:07:22 -0700 |
| commit | bfb6709d0b239af5e3ce5859aae926e1b79ba84b (patch) | |
| tree | ce675f8597bc6df886889ba4fa737640e72e7349 /net/irda/af_irda.c | |
| parent | d0cf0d9940ef27b46fcbbd9e0cc8427c30fe05eb (diff) | |
| download | linux-bfb6709d0b239af5e3ce5859aae926e1b79ba84b.tar.bz2 | |
[IrDA]: Correctly handling socket error
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>
Diffstat (limited to 'net/irda/af_irda.c')
| -rw-r--r-- | 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 eabd6838f50a..0eb7d596d470 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 *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) |