netdev - Re: [PATCH 6/8] netfilter: ipt_CLUSTERIP: 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: <1282111708.2456.11.camel@edumazet-laptop>
Date:	Wed, 18 Aug 2010 08:08:28 +0200
From:	Eric Dumazet <eric.dumazet@...il.com>
To:	Changli Gao <xiaosuo@...il.com>
Cc:	Patrick McHardy <kaber@...sh.net>,
	"David S. Miller" <davem@...emloft.net>,
	netfilter-devel@...r.kernel.org, netdev@...r.kernel.org
Subject: Re: [PATCH 6/8] netfilter: ipt_CLUSTERIP: use proto_ports_offset()
 to support AH message

Le mercredi 18 août 2010 à 13:05 +0800, Changli Gao a écrit :
> Signed-off-by: Changli Gao <xiaosuo@...il.com>
> ---
>  net/ipv4/netfilter/ipt_CLUSTERIP.c |   34 ++++++++++++++++++----------------
>  1 file changed, 18 insertions(+), 16 deletions(-)
> diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
> index 3a43cf3..11c3534 100644
> --- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
> +++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
> @@ -29,6 +29,7 @@
>  #include <net/netfilter/nf_conntrack.h>
>  #include <net/net_namespace.h>
>  #include <net/checksum.h>
> +#include <net/ip.h>
>  
>  #define CLUSTERIP_VERSION "0.8"
>  
> @@ -231,24 +232,25 @@ clusterip_hashfn(const struct sk_buff *skb,
>  {
>  	const struct iphdr *iph = ip_hdr(skb);
>  	unsigned long hashval;
> -	u_int16_t sport, dport;
> +	u_int16_t sport = 0, dport = 0;
>  	const u_int16_t *ports;
>  
> -	switch (iph->protocol) {
> -	case IPPROTO_TCP:
> -	case IPPROTO_UDP:
> -	case IPPROTO_UDPLITE:
> -	case IPPROTO_SCTP:
> -	case IPPROTO_DCCP:
> -	case IPPROTO_ICMP:
> -		ports = (const void *)iph+iph->ihl*4;
> -		sport = ports[0];
> -		dport = ports[1];
> -		break;
> -	default:
> -		if (net_ratelimit())
> -			pr_info("unknown protocol %u\n", iph->protocol);
> -		sport = dport = 0;
> +	if (!(iph->frag_off & htons(IP_MF|IP_OFFSET))) {

This added test is not documented in your Changelog

Please dont add such things not telling why you do it.

I am not sure it is needed here, I dont know ipt_CLUSTERIP, but dont
defrag takes place before it ?

> +		int poff;
> +
> +		poff = proto_ports_offset(iph->protocol);
> +		if (poff >= 0) {
> +			u16 _ports[2];
> +			ports = skb_header_pointer(skb, iph->ihl * 4 + poff,
> +						   4, _ports);
> +			if (ports) {
> +				sport = ports[0];
> +				dport = ports[1];
> +			}
> +		} else {
> +			if (net_ratelimit())
> +				pr_info("unknown protocol %u\n", iph->protocol);
> +		}
>  	}
>  
>  	switch (config->hash_mode) {


--
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