From dfe61a6ede286d898aaed0ef83229e146eff627f Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 7 Aug 2006 20:09:20 -0700 Subject: [PATCH] --- yaml --- r: 33302 b: refs/heads/master c: 8b5cc5ef40c83c6ea4c90b203bb2c8b17edfa11b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipx/af_ipx.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 072d0ecb3703..b5a58fc3eb3d 100644 --- 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 index aa34ff4b707c..c13e86b14f69 100644 --- 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 &&