diff options
author | Al Viro <viro@ZenIV.linux.org.uk> | 2011-06-05 00:37:35 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-06-05 14:11:09 -0700 |
commit | c316e6a3084cef1a5857cd66bb5429c969f06c93 (patch) | |
tree | 4e50df4d1c0d3df5db7fb8df51225adc950c417e /net/core | |
parent | 23c79d31a3dd2602ee1a5ff31303b2d7a2d3c159 (diff) | |
download | linux-3.10-c316e6a3084cef1a5857cd66bb5429c969f06c93.tar.gz linux-3.10-c316e6a3084cef1a5857cd66bb5429c969f06c93.tar.bz2 linux-3.10-c316e6a3084cef1a5857cd66bb5429c969f06c93.zip |
get_net_ns_by_fd() oopses if proc_ns_fget() returns an error
BTW, looking through the code related to struct net lifetime rules has
caught something else:
struct net *get_net_ns_by_fd(int fd)
{
...
file = proc_ns_fget(fd);
if (!file)
goto out;
ei = PROC_I(file->f_dentry->d_inode);
while in proc_ns_fget() we have two return ERR_PTR(...) and not a single
path that would return NULL. The other caller of proc_ns_fget() treats
ERR_PTR() correctly...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/net_namespace.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index 6c6b86d0da1..e41e5110c65 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -310,19 +310,17 @@ struct net *get_net_ns_by_fd(int fd) struct file *file; struct net *net; - net = ERR_PTR(-EINVAL); file = proc_ns_fget(fd); - if (!file) - goto out; + if (IS_ERR(file)) + return ERR_CAST(file); ei = PROC_I(file->f_dentry->d_inode); - if (ei->ns_ops != &netns_operations) - goto out; + if (ei->ns_ops == &netns_operations) + net = get_net(ei->ns); + else + net = ERR_PTR(-EINVAL); - net = get_net(ei->ns); -out: - if (file) - fput(file); + fput(file); return net; } |