diff options
| author |   Hendrik Brueckner <brueckner@linux.vnet.ibm.com> | 2009-04-21 06:04:21 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-04-21 23:43:13 -0700 |
| commit | 60d3705fcbfe7deca8e94bc7ddecd6f9f1a4647e (patch) | |
| tree | afd8b424d6a8367ebca081e103a035ca346f88f9 /net/iucv | |
| parent | af_iucv: consider state IUCV_CLOSING when closing a socket (diff) | |
| download | linux-dev-60d3705fcbfe7deca8e94bc7ddecd6f9f1a4647e.tar.xz linux-dev-60d3705fcbfe7deca8e94bc7ddecd6f9f1a4647e.zip | |
af_iucv: fix oops in iucv_sock_recvmsg() for MSG_PEEK flag
If iucv_sock_recvmsg() is called with MSG_PEEK flag set, the skb is enqueued
twice. If the socket is then closed, the pointer to the skb is freed twice.
Remove the skb_queue_head() call for MSG_PEEK, because the skb_recv_datagram()
function already handles MSG_PEEK (does not dequeue the skb).
Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/iucv')
| -rw-r--r-- | net/iucv/af_iucv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c index 2941ee50393b..42b3be302c57 100644 --- a/net/iucv/af_iucv.c +++ b/net/iucv/af_iucv.c @@ -814,6 +814,8 @@ static int iucv_sock_recvmsg(struct kiocb *iocb, struct socket *sock, target = sock_rcvlowat(sk, flags & MSG_WAITALL, len); + /* receive/dequeue next skb: + * the function understands MSG_PEEK and, thus, does not dequeue skb */ skb = skb_recv_datagram(sk, flags, noblock, &err); if (!skb) { if (sk->sk_shutdown & RCV_SHUTDOWN) @@ -861,9 +863,7 @@ static int iucv_sock_recvmsg(struct kiocb *iocb, struct socket *sock, iucv_process_message_q(sk); spin_unlock_bh(&iucv->message_q.lock); } - - } else - skb_queue_head(&sk->sk_receive_queue, skb); + } done: return err ? : copied; |