diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-02-05 14:42:23 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-05 14:42:23 -0500 |
| commit | 547472b8e1da72ae226430c0c4273e36fc8ca768 (patch) | |
| tree | 2300023f8d0fa943725e1b4ea3b2b95c91de4430 /net/ipv4/protocol.c | |
| parent | l2tp: Make ipv4 protocol handler namespace aware. (diff) | |
| download | linux-dev-547472b8e1da72ae226430c0c4273e36fc8ca768.tar.xz linux-dev-547472b8e1da72ae226430c0c4273e36fc8ca768.zip | |
ipv4: Disallow non-namespace aware protocols to register.
All in-tree ipv4 protocol implementations are now namespace
aware. Therefore all the run-time checks are superfluous.
Reject registry of any non-namespace aware ipv4 protocol.
Eventually we'll remove prot->netns_ok and this registry
time check as well.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/protocol.c')
| -rw-r--r-- | net/ipv4/protocol.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/ipv4/protocol.c b/net/ipv4/protocol.c index 0f9d09f54bd9..ce848461acbb 100644 --- a/net/ipv4/protocol.c +++ b/net/ipv4/protocol.c @@ -37,6 +37,12 @@ const struct net_offload __rcu *inet_offloads[MAX_INET_PROTOS] __read_mostly; int inet_add_protocol(const struct net_protocol *prot, unsigned char protocol) { + if (!prot->netns_ok) { + pr_err("Protocol %u is not namespace aware, cannot register.\n", + protocol); + return -EINVAL; + } + return !cmpxchg((const struct net_protocol **)&inet_protos[protocol], NULL, prot) ? 0 : -1; } |