From 6018030c965a5884c56978bd1256d1aeab36c2cb Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Wed, 19 Apr 2006 15:37:13 -0700
Subject: [PATCH] --- yaml --- r: 26071 b: refs/heads/master c:
 5185db09f46ed64d520d09db6e93852e44106628 h: refs/heads/master i:   26069:
 73306a9396ebedb558feb886cab0e2200b76a8a3   26067:
 4bdf40047a945d9a9c2ba662044512c051289769   26063:
 1852b2cac11d2a2db2860d61914ca9a235461ec2 v: v3

---
 [refs]                    | 2 +-
 trunk/net/llc/llc_input.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6567becc41b7..88ccb5990174 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3672558c6180ca28a7aa46765702467a37e58fc5
+refs/heads/master: 5185db09f46ed64d520d09db6e93852e44106628
diff --git a/trunk/net/llc/llc_input.c b/trunk/net/llc/llc_input.c
index 8f3addf0724c..d62e0f9b9da3 100644
--- a/trunk/net/llc/llc_input.c
+++ b/trunk/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;
 }