From: Jochen Friedrich <jochen@scram.de>
Date: Thu, 22 Sep 2005 07:48:46 +0000 (-0300)
Subject: [LLC]: Fix llc_fixup_skb() bug
X-Git-Tag: v2.6.14-rc3~103^2^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=096f0eb1dff326ddebfedeb128fb48d5b7ca75e1;p=linux-2.6-omap-h63xx.git

[LLC]: Fix llc_fixup_skb() bug

llc_fixup_skb() had a bug dropping 3 bytes packets (like UA frames). Token ring
doesn't pad these frames.

Signed-off-by: Jochen Friedrich <jochen@scram.de>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
---

diff --git a/net/llc/llc_input.c b/net/llc/llc_input.c
index 789eec42645..8f3addf0724 100644
--- a/net/llc/llc_input.c
+++ b/net/llc/llc_input.c
@@ -99,15 +99,19 @@ out:
 static inline int llc_fixup_skb(struct sk_buff *skb)
 {
 	u8 llc_len = 2;
-	struct llc_pdu_sn *pdu;
+	struct llc_pdu_un *pdu;
 
 	if (unlikely(!pskb_may_pull(skb, sizeof(*pdu))))
 		return 0;
 
-	pdu = (struct llc_pdu_sn *)skb->data;
+	pdu = (struct llc_pdu_un *)skb->data;
 	if ((pdu->ctrl_1 & LLC_PDU_TYPE_MASK) == LLC_PDU_TYPE_U)
 		llc_len = 1;
 	llc_len += 2;
+
+	if (unlikely(!pskb_may_pull(skb, llc_len)))
+		return 0;
+
 	skb->h.raw += llc_len;
 	skb_pull(skb, llc_len);
 	if (skb->protocol == htons(ETH_P_802_2)) {