[PATCH 3.16 163/178] cx82310_eth: use skb_cow_head() to deal with cloned skbs

From	Ben Hutchings <ben@decadent.org.uk>
Newsgroups	linux.kernel
Subject	[PATCH 3.16 163/178] cx82310_eth: use skb_cow_head() to deal with cloned skbs
Date	2017-07-16 16:30 +0200
Message-ID	<u3SIA-be-59@gated-at.bofh.it> (permalink)
References	<u3Sfv-89R-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

3.16.46-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: Eric Dumazet <edumazet@google.com>

commit a9e840a2081ed28c2b7caa6a9a0041c950b3c37d upstream.

We need to ensure there is enough headroom to push extra header,
but we also need to check if we are allowed to change headers.

skb_cow_head() is the proper helper to deal with this.

Fixes: cc28a20e77b2 ("introduce cx82310_eth: Conexant CX82310-based ADSL router USB ethernet driver")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: James Hughes <james.hughes@raspberrypi.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 drivers/net/usb/cx82310_eth.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

--- a/drivers/net/usb/cx82310_eth.c
+++ b/drivers/net/usb/cx82310_eth.c
@@ -275,12 +275,9 @@ static struct sk_buff *cx82310_tx_fixup(
 {
 	int len = skb->len;
 
-	if (skb_headroom(skb) < 2) {
-		struct sk_buff *skb2 = skb_copy_expand(skb, 2, 0, flags);
+	if (skb_cow_head(skb, 2)) {
 		dev_kfree_skb_any(skb);
-		skb = skb2;
-		if (!skb)
-			return NULL;
+		return NULL;
 	}
 	skb_push(skb, 2);

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 3.16 163/178] cx82310_eth: use skb_cow_head() to deal with  cloned skbs Ben Hutchings <ben@decadent.org.uk> - 2017-07-16 16:30 +0200

csiph-web