]> git.itanic.dy.fi Git - linux-stable/commitdiff
[IPX]: Header length validation needed
authorStephen Hemminger <shemminger@osdl.org>
Fri, 24 Nov 2006 01:57:28 +0000 (02:57 +0100)
committerAdrian Bunk <bunk@stusta.de>
Fri, 24 Nov 2006 01:57:28 +0000 (02:57 +0100)
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>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
net/ipx/af_ipx.c

index 2b72248022d8e7834b49ccd5e1441a3ddfebea5f..30eaeb2b33a4b26ecd6714e1fb070546c576195a 100644 (file)
@@ -1647,7 +1647,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 &&