net: Fix skb_set_peeked use-after-free bug
authorHerbert Xu <herbert@gondor.apana.org.au>
Tue, 4 Aug 2015 07:42:47 +0000 (15:42 +0800)
committerDanny Wood <danwood76@gmail.com>
Tue, 29 Jan 2019 13:10:12 +0000 (13:10 +0000)
commitf56209e6c7cdc6f3ce4697e0fc0d0074025e2ee9
tree10232b69f261a4ce3ec1b1dc5e9b0bd5a9547eae
parent9e23e2110735d5203a1ad099cdaeacb5a4c68816
net: Fix skb_set_peeked use-after-free bug

[ Upstream commit a0a2a6602496a45ae838a96db8b8173794b5d398 ]

The commit 738ac1ebb96d02e0d23bc320302a6ea94c612dec ("net: Clone
skb before setting peeked flag") introduced a use-after-free bug
in skb_recv_datagram.  This is because skb_set_peeked may create
a new skb and free the existing one.  As it stands the caller will
continue to use the old freed skb.

This patch fixes it by making skb_set_peeked return the new skb
(or the old one if unchanged).

Fixes: 738ac1ebb96d ("net: Clone skb before setting peeked flag")
Reported-by: Brenden Blanco <bblanco@plumgrid.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Tested-by: Brenden Blanco <bblanco@plumgrid.com>
Reviewed-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/core/datagram.c