netfilter: ipt_CLUSTERIP: use proto_ports_offset() to support AH message

Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
index 3a43cf36db8701f9b8a99317a60da0e3ac2ad8f4..1e26a4897655bddd2720730956ebe2d15d265ebf 100644 (file)
--- 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,22 @@ clusterip_hashfn(const struct sk_buff *skb,
 {
        const struct iphdr *iph = ip_hdr(skb);
        unsigned long hashval;
-       u_int16_t sport, dport;
-       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:
+       u_int16_t sport = 0, dport = 0;
+       int poff;
+
+       poff = proto_ports_offset(iph->protocol);
+       if (poff >= 0) {
+               const u_int16_t *ports;
+               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);
-               sport = dport = 0;
        }
 
        switch (config->hash_mode) {