diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-01-26 15:02:55 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-28 03:06:02 +0100 |
| commit | 5ee4433efe99b9f39f6eff5052a177bbcfe72cea (patch) | |
| tree | 0be8ae9b59828b3fee0fdf5cac9432604a317230 /include/net | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| download | linux-5ee4433efe99b9f39f6eff5052a177bbcfe72cea.tar.xz linux-5ee4433efe99b9f39f6eff5052a177bbcfe72cea.zip | |
netns: Fail conspicously if someone uses net_generic at an inappropriate time.
By definition net_generic should never be called when it can return
NULL. Fail conspicously with a BUG_ON to make it clear when people mess
up that a NULL return should never happen.
Recently there was a bug in the CAIF subsystem where it was registered
with register_pernet_device instead of register_pernet_subsys. It was
erroneously concluded that net_generic could validly return NULL and
that net_assign_generic was buggy (when it was just inefficient).
Hopefully this BUG_ON will prevent people to coming to similar erroneous
conclusions in the futrue.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Tested-by: Sasha Levin <levinsasha928@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/netns/generic.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/netns/generic.h b/include/net/netns/generic.h index 3419bf5cd154..d55f43443335 100644 --- a/include/net/netns/generic.h +++ b/include/net/netns/generic.h @@ -41,6 +41,7 @@ static inline void *net_generic(const struct net *net, int id) ptr = ng->ptr[id - 1]; rcu_read_unlock(); + BUG_ON(!ptr); return ptr; } #endif |