Commit 79ca035d authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

Pull proc fix from Eric Biederman:
 "Syzbot found a NULL pointer dereference if kzalloc of s_fs_info fails"

* 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  proc: s_fs_info may be NULL when proc_kill_sb is called
parents 4152d146 058f2e4d
...@@ -264,11 +264,13 @@ static void proc_kill_sb(struct super_block *sb) ...@@ -264,11 +264,13 @@ static void proc_kill_sb(struct super_block *sb)
{ {
struct proc_fs_info *fs_info = proc_sb_info(sb); struct proc_fs_info *fs_info = proc_sb_info(sb);
if (fs_info->proc_self) if (!fs_info) {
dput(fs_info->proc_self); kill_anon_super(sb);
return;
}
if (fs_info->proc_thread_self) dput(fs_info->proc_self);
dput(fs_info->proc_thread_self); dput(fs_info->proc_thread_self);
kill_anon_super(sb); kill_anon_super(sb);
put_pid_ns(fs_info->pid_ns); put_pid_ns(fs_info->pid_ns);
......
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