mirror of
https://github.com/torvalds/linux.git
synced 2024-11-11 06:31:49 +00:00
9d78edeaec
syzbot found that touch /proc/testfile causes NULL pointer dereference at tomoyo_get_local_path() because inode of the dentry is NULL. Beforec59f415a7c, Tomoyo received pid_ns from proc's s_fs_info directly. Since proc_pid_ns() can only work with inode, using it in the tomoyo_get_local_path() was wrong. To avoid creating more functions for getting proc_ns, change the argument type of the proc_pid_ns() function. Then, Tomoyo can use the existing super_block to get pid_ns. Link: https://lkml.kernel.org/r/0000000000002f0c7505a5b0e04c@google.com Link: https://lkml.kernel.org/r/20200518180738.2939611-1-gladkov.alexey@gmail.com Reported-by: syzbot+c1af344512918c61362c@syzkaller.appspotmail.com Fixes:c59f415a7c("Use proc_pid_ns() to get pid_namespace from the proc superblock") Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
74 lines
1.9 KiB
C
74 lines
1.9 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <linux/cache.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/pid_namespace.h>
|
|
#include "internal.h"
|
|
|
|
/*
|
|
* /proc/thread_self:
|
|
*/
|
|
static const char *proc_thread_self_get_link(struct dentry *dentry,
|
|
struct inode *inode,
|
|
struct delayed_call *done)
|
|
{
|
|
struct pid_namespace *ns = proc_pid_ns(inode->i_sb);
|
|
pid_t tgid = task_tgid_nr_ns(current, ns);
|
|
pid_t pid = task_pid_nr_ns(current, ns);
|
|
char *name;
|
|
|
|
if (!pid)
|
|
return ERR_PTR(-ENOENT);
|
|
name = kmalloc(10 + 6 + 10 + 1, dentry ? GFP_KERNEL : GFP_ATOMIC);
|
|
if (unlikely(!name))
|
|
return dentry ? ERR_PTR(-ENOMEM) : ERR_PTR(-ECHILD);
|
|
sprintf(name, "%u/task/%u", tgid, pid);
|
|
set_delayed_call(done, kfree_link, name);
|
|
return name;
|
|
}
|
|
|
|
static const struct inode_operations proc_thread_self_inode_operations = {
|
|
.get_link = proc_thread_self_get_link,
|
|
};
|
|
|
|
static unsigned thread_self_inum __ro_after_init;
|
|
|
|
int proc_setup_thread_self(struct super_block *s)
|
|
{
|
|
struct inode *root_inode = d_inode(s->s_root);
|
|
struct proc_fs_info *fs_info = proc_sb_info(s);
|
|
struct dentry *thread_self;
|
|
int ret = -ENOMEM;
|
|
|
|
inode_lock(root_inode);
|
|
thread_self = d_alloc_name(s->s_root, "thread-self");
|
|
if (thread_self) {
|
|
struct inode *inode = new_inode_pseudo(s);
|
|
if (inode) {
|
|
inode->i_ino = thread_self_inum;
|
|
inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
|
|
inode->i_mode = S_IFLNK | S_IRWXUGO;
|
|
inode->i_uid = GLOBAL_ROOT_UID;
|
|
inode->i_gid = GLOBAL_ROOT_GID;
|
|
inode->i_op = &proc_thread_self_inode_operations;
|
|
d_add(thread_self, inode);
|
|
ret = 0;
|
|
} else {
|
|
dput(thread_self);
|
|
}
|
|
}
|
|
inode_unlock(root_inode);
|
|
|
|
if (ret)
|
|
pr_err("proc_fill_super: can't allocate /proc/thread-self\n");
|
|
else
|
|
fs_info->proc_thread_self = thread_self;
|
|
|
|
return ret;
|
|
}
|
|
|
|
void __init proc_thread_self_init(void)
|
|
{
|
|
proc_alloc_inum(&thread_self_inum);
|
|
}
|