netdev - Re: [PATCH 8/8] net_sched: sch_sfq: use proto_ports

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <1282129531.23601.20.camel@bigi>
Date:	Wed, 18 Aug 2010 07:05:31 -0400
From:	jamal <hadi@...erus.ca>
To:	Changli Gao <xiaosuo@...il.com>
Cc:	"David S. Miller" <davem@...emloft.net>, netdev@...r.kernel.org
Subject: Re: [PATCH 8/8] net_sched: sch_sfq: use proto_ports_offset() to
 support AH message

On Wed, 2010-08-18 at 13:07 +0800, Changli Gao wrote:

>  		const struct iphdr *iph;
> +		int poff;
>  
>  		if (!pskb_network_may_pull(skb, sizeof(*iph)))
>  			goto err;
>  		iph = ip_hdr(skb);
>  		h = (__force u32)iph->daddr;
>  		h2 = (__force u32)iph->saddr ^ iph->protocol;
> -		if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) &&
> -		    (iph->protocol == IPPROTO_TCP ||
> -		     iph->protocol == IPPROTO_UDP ||
> -		     iph->protocol == IPPROTO_UDPLITE ||
> -		     iph->protocol == IPPROTO_SCTP ||
> -		     iph->protocol == IPPROTO_DCCP ||
> -		     iph->protocol == IPPROTO_ESP) &&
> -		     pskb_network_may_pull(skb, iph->ihl * 4 + 4))
> -			h2 ^= *(((u32*)iph) + iph->ihl);
> +		if (iph->frag_off & htons(IP_MF|IP_OFFSET))
> +			break;
> +		poff = proto_ports_offset(iph->protocol);
> +		if (poff >= 0 &&
> +		    pskb_network_may_pull(skb, iph->ihl * 4 + 4 + poff)) {
> +			iph = ip_hdr(skb);
> +			h2 ^= *(u32*)((void *)iph + iph->ihl * 4 + poff);
> +		}
>  		break;

Same comment with this one as earlier patch? Or it may be too early
here ;->

cheers,
jamal

>  	case htons(ETH_P_IPV6):
>  	{
>  		struct ipv6hdr *iph;
> +		int poff;
>  
>  		if (!pskb_network_may_pull(skb, sizeof(*iph)))
>  			goto err;
>  		iph = ipv6_hdr(skb);
>  		h = (__force u32)iph->daddr.s6_addr32[3];
>  		h2 = (__force u32)iph->saddr.s6_addr32[3] ^ iph->nexthdr;
> -		if ((iph->nexthdr == IPPROTO_TCP ||
> -		     iph->nexthdr == IPPROTO_UDP ||
> -		     iph->nexthdr == IPPROTO_UDPLITE ||
> -		     iph->nexthdr == IPPROTO_SCTP ||
> -		     iph->nexthdr == IPPROTO_DCCP ||
> -		     iph->nexthdr == IPPROTO_ESP) &&
> -		    pskb_network_may_pull(skb, sizeof(*iph) + 4))
> -			h2 ^= *(u32*)&iph[1];
> +		poff = proto_ports_offset(iph->nexthdr);
> +		if (poff >= 0 &&
> +		    pskb_network_may_pull(skb, sizeof(*iph) + 4 + poff)) {
> +			iph = ipv6_hdr(skb);
> +			h2 ^= *(u32*)((void *)iph + sizeof(*iph) + poff);
> +		}
>  		break;
>  	}
>  	default:

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html