---

yaml --- r: 33302 b: refs/heads/master c: 8b5cc5e h: refs/heads/master v: v3
git-mirror · Aug 8, 2006 · dfe61a6 · dfe61a6
1 parent 3c73e3c
commit dfe61a6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d14cc9a342a8004b0ecfe66f1f12120962b61d8c
+refs/heads/master: 8b5cc5ef40c83c6ea4c90b203bb2c8b17edfa11b
diff --git a/trunk/net/ipx/af_ipx.c b/trunk/net/ipx/af_ipx.c
@@ -1646,7 +1646,8 @@ static int ipx_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_ty
 	ipx_pktsize	= ntohs(ipx->ipx_pktsize);
 
 	/* Too small or invalid header? */
-	if (ipx_pktsize < sizeof(struct ipxhdr) || ipx_pktsize > skb->len)
+	if (ipx_pktsize < sizeof(struct ipxhdr) ||
+	    !pskb_may_pull(skb, ipx_pktsize))
 		goto drop;
 
 	if (ipx->ipx_checksum != IPX_NO_CHECKSUM &&