Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-01 00:21:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

get_net_ns_by_fd() oopses if proc_ns_fget() returns an error

Browse Source 
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>
This commit is contained in:
Al Viro 2011-06-05 00:37:35 +00:00 committed by David S. Miller
parent 23c79d31a3
commit c316e6a308
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/core/net_namespace.c
View File

@ -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;
} }