net: llc: fix use after free in llc_ui_recvmsg
authorDaniel Borkmann <dborkman@redhat.com>
Mon, 30 Dec 2013 22:40:50 +0000 (23:40 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Sat, 15 Feb 2014 19:20:10 +0000 (19:20 +0000)
commit10cc99961394c0e62e0742d5459f4b347f540d30
tree4d61cd715b45da438c609415ee46c8b70711b3c4
parent31da359741b539fb236d5781b46ee7c5c6d8f14c
net: llc: fix use after free in llc_ui_recvmsg

[ Upstream commit 4d231b76eef6c4a6bd9c96769e191517765942cb ]

While commit 30a584d944fb fixes datagram interface in LLC, a use
after free bug has been introduced for SOCK_STREAM sockets that do
not make use of MSG_PEEK.

The flow is as follow ...

  if (!(flags & MSG_PEEK)) {
    ...
    sk_eat_skb(sk, skb, false);
    ...
  }
  ...
  if (used + offset < skb->len)
    continue;

... where sk_eat_skb() calls __kfree_skb(). Therefore, cache
original length and work on skb_len to check partial reads.

Fixes: 30a584d944fb ("[LLX]: SOCK_DGRAM interface fixes")
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
net/llc/af_llc.c