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)
committerWilly Tarreau <w@1wt.eu>
Mon, 19 May 2014 05:54:10 +0000 (07:54 +0200)
commit6a6c028da0e743587e84b3d4a7a6d8bb613adcdd
tree6e659f7bd6a940b7bbfa6b702a816804031a0bee
parentdb091f2ff42280daa4a00dc8b4899ff959e0c24d
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: Willy Tarreau <w@1wt.eu>
net/llc/af_llc.c