Re: [PATCH 5/6] dccp: Fix incorrect length check for ICMPv4 packets

[David Miller <davem@xxxxxxxxxxxxx>]

From: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
Date: Fri, 25 Jul 2008 10:02:57 +0100

> --- a/net/dccp/ipv4.c
> +++ b/net/dccp/ipv4.c
> @@ -207,7 +207,7 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info)
>  	int err;
>  	struct net *net = dev_net(skb->dev);
>  
> -	if (skb->len < (iph->ihl << 2) + 8) {
> +	if (skb->len < (iph->ihl << 2) + __dccp_basic_hdr_len(dh)) {
>  		ICMP_INC_STATS_BH(net, ICMP_MIB_INERRORS);
>  		return;
>  	}

You can't dereference "dh" before you know there is even
space past offset "iph->ihl << 2".  Yet that is what doing
an unconditional __dccp_basic_hdr_len() call here is going
to do.

The ipv6 patch has the same bug.

The test probably needs to be something like:

	if (skb->len < (iph->ihl << 2) + sizeof(*dh) ||
	    skb->len < (iph->ihl << 2) + __dccp_basic_hdr_len(dh))

in order to make the tests safely.
--
To unsubscribe from this list: send the line "unsubscribe dccp" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html