diff options
| author | David S. Miller <davem@davemloft.net> | 2012-06-19 18:56:21 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-19 18:56:21 -0700 |
| commit | f9242b6b28d61295f2bf7e8adfb1060b382e5381 (patch) | |
| tree | b395670bd6ae832e9f6f87f47a1840baf3a06d0d /net/ipv6/raw.c | |
| parent | 677a3d60fb3153f786a0d28fcf0287670e7bd3c2 (diff) | |
| download | linux-f9242b6b28d61295f2bf7e8adfb1060b382e5381.tar.gz linux-f9242b6b28d61295f2bf7e8adfb1060b382e5381.tar.bz2 linux-f9242b6b28d61295f2bf7e8adfb1060b382e5381.zip | |
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/ipv6/raw.c')
| -rw-r--r-- | net/ipv6/raw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 43b0042f15f4..b5c1dcb27737 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -165,7 +165,7 @@ static bool ipv6_raw_deliver(struct sk_buff *skb, int nexthdr) saddr = &ipv6_hdr(skb)->saddr; daddr = saddr + 1; - hash = nexthdr & (MAX_INET_PROTOS - 1); + hash = nexthdr & (RAW_HTABLE_SIZE - 1); read_lock(&raw_v6_hashinfo.lock); sk = sk_head(&raw_v6_hashinfo.ht[hash]); @@ -229,7 +229,7 @@ bool raw6_local_deliver(struct sk_buff *skb, int nexthdr) { struct sock *raw_sk; - raw_sk = sk_head(&raw_v6_hashinfo.ht[nexthdr & (MAX_INET_PROTOS - 1)]); + raw_sk = sk_head(&raw_v6_hashinfo.ht[nexthdr & (RAW_HTABLE_SIZE - 1)]); if (raw_sk && !ipv6_raw_deliver(skb, nexthdr)) raw_sk = NULL; |