Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9a11334 authored by Herbert Xu's avatar Herbert Xu Committed by Sasha Levin
Browse files

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: default avatarBrenden Blanco <bblanco@plumgrid.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Tested-by: default avatarBrenden Blanco <bblanco@plumgrid.com>
Reviewed-by: default avatarKonstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 7feb2fc2

net/core/datagram.c

+38 −3
Original line number Diff line number Diff line
@@ -130,6 +130,35 @@ out_noerr: 
	goto out;

}



static int skb_set_peeked(struct sk_buff *skb)

{

	struct sk_buff *nskb;



	if (skb->peeked)

		return 0;



	/* We have to unshare an skb before modifying it. */

	if (!skb_shared(skb))

		goto done;



	nskb = skb_clone(skb, GFP_ATOMIC);

	if (!nskb)

		return -ENOMEM;



	skb->prev->next = nskb;

	skb->next->prev = nskb;

	nskb->prev = skb->prev;

	nskb->next = skb->next;



	consume_skb(skb);

	skb = nskb;



done:

	skb->peeked = 1;



	return 0;

}



/**

 *	__skb_recv_datagram - Receive a datagram skbuff

 *	@sk: socket
@@ -164,7 +193,9 @@ out_noerr: 
struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,

				    int *peeked, int *off, int *err)

{

	struct sk_buff_head *queue = &sk->sk_receive_queue;

	struct sk_buff *skb, *last;

	unsigned long cpu_flags;

	long timeo;

	/*

	 * Caller is allowed not to check sk->sk_err before skb_recv_datagram()
@@ -183,8 +214,6 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags, 
		 * Look at current nfs client by the way...

		 * However, this function was correct in any case. 8)

		 */

		unsigned long cpu_flags;

		struct sk_buff_head *queue = &sk->sk_receive_queue;

		int _off = *off;



		last = (struct sk_buff *)queue;
@@ -198,7 +227,11 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags, 
					_off -= skb->len;

					continue;

				}

				skb->peeked = 1;



				error = skb_set_peeked(skb);

				if (error)

					goto unlock_err;



				atomic_inc(&skb->users);

			} else

				__skb_unlink(skb, queue);
@@ -222,6 +255,8 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags, 


	return NULL;



unlock_err:

	spin_unlock_irqrestore(&queue->lock, cpu_flags);

no_packet:

	*err = error;

	return NULL;