summaryrefslogtreecommitdiffstats
path: root/net/ipx
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2006-08-07 20:09:20 -0700
committerDavid S. Miller <davem@davemloft.net>2006-08-07 20:09:20 -0700
commit8b5cc5ef40c83c6ea4c90b203bb2c8b17edfa11b (patch)
tree35b76d98988aabfc78a57342291b4be63bb04f99 /net/ipx
parentd14cc9a342a8004b0ecfe66f1f12120962b61d8c (diff)
downloadlinux-8b5cc5ef40c83c6ea4c90b203bb2c8b17edfa11b.tar.gz
linux-8b5cc5ef40c83c6ea4c90b203bb2c8b17edfa11b.tar.bz2
linux-8b5cc5ef40c83c6ea4c90b203bb2c8b17edfa11b.zip
[IPX]: Header length validation needed
This patch will linearize and check there is enough data. It handles the pprop case as well as avoiding a whole audit of the routing code. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipx')
-rw-r--r--net/ipx/af_ipx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
index aa34ff4b707c..c13e86b14f69 100644
--- a/net/ipx/af_ipx.c
+++ b/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 &&