Commit c316e6a3 authored by Al Viro's avatar Al Viro Committed by David S. Miller

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: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 23c79d31
...@@ -310,19 +310,17 @@ struct net *get_net_ns_by_fd(int fd) ...@@ -310,19 +310,17 @@ struct net *get_net_ns_by_fd(int fd)
struct file *file; struct file *file;
struct net *net; struct net *net;
net = ERR_PTR(-EINVAL);
file = proc_ns_fget(fd); file = proc_ns_fget(fd);
if (!file) if (IS_ERR(file))
goto out; return ERR_CAST(file);
ei = PROC_I(file->f_dentry->d_inode); ei = PROC_I(file->f_dentry->d_inode);
if (ei->ns_ops != &netns_operations) if (ei->ns_ops == &netns_operations)
goto out; net = get_net(ei->ns);
else
net = ERR_PTR(-EINVAL);
net = get_net(ei->ns); fput(file);
out:
if (file)
fput(file);
return net; return net;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment