diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2006-08-08 05:09:20 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-08-08 05:09:20 +0200 |
| commit | 8b5cc5ef40c83c6ea4c90b203bb2c8b17edfa11b (patch) | |
| tree | 35b76d98988aabfc78a57342291b4be63bb04f99 /net/ipx/af_ipx.c | |
| parent | [TG3]: skb->dev assignment is done by netdev_alloc_skb (diff) | |
| download | linux-8b5cc5ef40c83c6ea4c90b203bb2c8b17edfa11b.tar.xz 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/af_ipx.c')
| -rw-r--r-- | net/ipx/af_ipx.c | 3 |
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 && |