diff options
| author | David S. Miller <davem@davemloft.net> | 2012-06-20 05:56:21 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-20 05:56:21 +0400 |
| commit | f9242b6b28d61295f2bf7e8adfb1060b382e5381 (patch) | |
| tree | b395670bd6ae832e9f6f87f47a1840baf3a06d0d /net/ipv4/ip_input.c | |
| parent | 677a3d60fb3153f786a0d28fcf0287670e7bd3c2 (diff) | |
| download | linux-f9242b6b28d61295f2bf7e8adfb1060b382e5381.tar.xz | |
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>
Diffstat (limited to 'net/ipv4/ip_input.c')
| -rw-r--r-- | net/ipv4/ip_input.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c index 8590144ca330..c4fe1d271131 100644 --- a/net/ipv4/ip_input.c +++ b/net/ipv4/ip_input.c @@ -198,14 +198,13 @@ static int ip_local_deliver_finish(struct sk_buff *skb) rcu_read_lock(); { int protocol = ip_hdr(skb)->protocol; - int hash, raw; const struct net_protocol *ipprot; + int raw; resubmit: raw = raw_local_deliver(skb, protocol); - hash = protocol & (MAX_INET_PROTOS - 1); - ipprot = rcu_dereference(inet_protos[hash]); + ipprot = rcu_dereference(inet_protos[protocol]); if (ipprot != NULL) { int ret; |