diff options
| author | Alex Juncu <ajuncu@ixiacom.com> | 2011-12-15 23:01:25 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-19 15:58:52 -0500 |
| commit | 9cef310fcdee12b49b8b4c96fd8f611c8873d284 (patch) | |
| tree | 9822f822a2cdc3bdc1beb70e061fcea006a923f2 /net/llc | |
| parent | a03ffcf873fe0f2565386ca8ef832144c42e67fa (diff) | |
| download | lwn-9cef310fcdee12b49b8b4c96fd8f611c8873d284.tar.gz lwn-9cef310fcdee12b49b8b4c96fd8f611c8873d284.zip | |
llc: llc_cmsg_rcv was getting called after sk_eat_skb.
Received non stream protocol packets were calling llc_cmsg_rcv that used a
skb after that skb was released by sk_eat_skb. This caused received STP
packets to generate kernel panics.
Signed-off-by: Alexandru Juncu <ajuncu@ixiacom.com>
Signed-off-by: Kunjan Naik <knaik@ixiacom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/llc')
| -rw-r--r-- | net/llc/af_llc.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c index dfd3a648a551..a18e6c3d36e3 100644 --- a/net/llc/af_llc.c +++ b/net/llc/af_llc.c @@ -833,15 +833,15 @@ static int llc_ui_recvmsg(struct kiocb *iocb, struct socket *sock, copied += used; len -= used; + /* For non stream protcols we get one packet per recvmsg call */ + if (sk->sk_type != SOCK_STREAM) + goto copy_uaddr; + if (!(flags & MSG_PEEK)) { sk_eat_skb(sk, skb, 0); *seq = 0; } - /* For non stream protcols we get one packet per recvmsg call */ - if (sk->sk_type != SOCK_STREAM) - goto copy_uaddr; - /* Partial read */ if (used + offset < skb->len) continue; @@ -857,6 +857,12 @@ copy_uaddr: } if (llc_sk(sk)->cmsg_flags) llc_cmsg_rcv(msg, skb); + + if (!(flags & MSG_PEEK)) { + sk_eat_skb(sk, skb, 0); + *seq = 0; + } + goto out; } |