Skip to contentSkip to conversation

Patch "phonet: properly unshare skbs in phonet_rcv()" has been added to the 4.3-stable tree

PATCH [email protected] 1 participant 1 message Jan 27, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

phonet: properly unshare skbs in phonet_rcv()

to the 4.3-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
phonet-properly-unshare-skbs-in-phonet_rcv.patch
and it can be found in the queue-4.3 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Tue Jan 26 21:35:03 PST 2016

From: Eric Dumazet <[email protected]>
Date: Tue, 12 Jan 2016 08:58:00 -0800
Subject: phonet: properly unshare skbs in phonet_rcv()

From: Eric Dumazet <[email protected]>

[ Upstream commit 7aaed57c5c2890634cfadf725173c7c68ea4cb4f ]

Ivaylo Dimitrov reported a regression caused by commit 7866a621043f ("dev: add per net_device packet type chains").

skb->dev becomes NULL and we crash in __netif_receive_skb_core().

Before above commit, different kind of bugs or corruptions could happen without major crash.

But the root cause is that phonet_rcv() can queue skb without checking if skb is shared or not.

Many thanks to Ivaylo Dimitrov for his help, diagnosis and tests.

---
 net/phonet/af_phonet.c |    4 ++++
 1 file changed, 4 insertions(+)
net/phonet/af_phonet.c +4 -0
@@ -377,6 +377,10 @@ static int phonet_rcv(struct sk_buff *sk
 	struct sockaddr_pn sa;
 	u16 len;
 
+	skb = skb_share_check(skb, GFP_ATOMIC);
+	if (!skb)
+		return NET_RX_DROP;
+
 	/* check we have at least a full Phonet header */
 	if (!pskb_pull(skb, sizeof(struct phonethdr)))
 		goto out;

Patches currently in stable-queue which might be from [email protected] are

queue-4.3/tcp-fix-zero-cwnd-in-tcp_cwnd_reduction.patch queue-4.3/net-sched-fix-missing-free-per-cpu-on-qstats.patch queue-4.3/ipv6-tcp-add-rcu-locking-in-tcp_v6_send_synack.patch queue-4.3/ipv6-update-skb-csum-when-ce-mark-is-propagated.patch queue-4.3/net-possible-use-after-free-in-dst_release.patch queue-4.3/phonet-properly-unshare-skbs-in-phonet_rcv.patch queue-4.3/tcp_yeah-don-t-set-ssthresh-below-2.patch