inet: Sanitize inet{,6} protocol demux.

Don't pretend that inet_protos[] and inet6_protos[] are hashes, thay
are just a straight arrays.  Remove all unnecessary hash masking.

Document MAX_INET_PROTOS.

Use RAW_HTABLE_SIZE when appropriate.

Reported-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 6 deletions

diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c
index 21a15dfe4a9e..5ab923e51af3 100644
--- a/net/ipv6/ip6_input.c
+++ b/net/ipv6/ip6_input.c
@@ -168,13 +168,12 @@ drop:
 
 static int ip6_input_finish(struct sk_buff *skb)
 {
+        struct net *net = dev_net(skb_dst(skb)->dev);
         const struct inet6_protocol *ipprot;
+        struct inet6_dev *idev;
         unsigned int nhoff;
         int nexthdr;
         bool raw;
-        u8 hash;
-        struct inet6_dev *idev;
-        struct net *net = dev_net(skb_dst(skb)->dev);
 
         /*
          *      Parse extension headers
@@ -189,9 +188,7 @@ resubmit:
         nexthdr = skb_network_header(skb)[nhoff];
 
         raw = raw6_local_deliver(skb, nexthdr);
-
-        hash = nexthdr & (MAX_INET_PROTOS - 1);
-        if ((ipprot = rcu_dereference(inet6_protos[hash])) != NULL) {
+        if ((ipprot = rcu_dereference(inet6_protos[nexthdr])) != NULL) {
                 int ret;
 
                 if (ipprot->flags & INET6_PROTO_FINAL) {