From: David S. Miller <davem@sunset.davemloft.net>
Date: Wed, 19 Apr 2006 22:37:13 +0000 (-0700)
Subject: [LLC]: Use pskb_trim_rcsum() in llc_fixup_skb().
X-Git-Tag: v2.6.17-rc3~58^2~4
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5185db09f46ed64d520d09db6e93852e44106628;p=linux-2.6

[LLC]: Use pskb_trim_rcsum() in llc_fixup_skb().

Kernel Bugzilla #6409

If we use plain skb_trim(), that's wrong, because if
the SKB is cloned, and it can be because we unshared
it in the caller, we have to allow reallocation.  The
pskb_trim*() family of routines is therefore the most
appropriate here.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/llc/llc_input.c b/net/llc/llc_input.c
index 8f3addf072..d62e0f9b9d 100644
--- a/net/llc/llc_input.c
+++ b/net/llc/llc_input.c
@@ -118,7 +118,8 @@ static inline int llc_fixup_skb(struct sk_buff *skb)
 		u16 pdulen = eth_hdr(skb)->h_proto,
 		    data_size = ntohs(pdulen) - llc_len;
 
-		skb_trim(skb, data_size);
+		if (unlikely(pskb_trim_rcsum(skb, data_size)))
+			return 0;
 	}
 	return 1;
 }