fs/proc/proc_sysctl.c: fix potential page fault while unregistering sysctl table
authorDanilo Krummrich <danilokrummrich@dk-develop.de>
Tue, 10 Apr 2018 23:31:38 +0000 (16:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Apr 2018 17:28:33 +0000 (10:28 -0700)
proc_sys_link_fill_cache() does not take currently unregistering sysctl
tables into account, which might result into a page fault in
sysctl_follow_link() - add a check to fix it.

This bug has been present since v3.4.

Link: http://lkml.kernel.org/r/20180228013506.4915-1-danilokrummrich@dk-develop.de
Fixes: 0e47c99d7fe25 ("sysctl: Replace root_list with links between sysctl_table_sets")
Signed-off-by: Danilo Krummrich <danilokrummrich@dk-develop.de>
Acked-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Cc: "Luis R . Rodriguez" <mcgrof@kernel.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

index c41ab261397df2875951db47ea38b7cbe2a5bae1..7da10e59529765200b8db1915c21807a90bde66e 100644 (file)
@@ -707,7 +707,10 @@ static bool proc_sys_link_fill_cache(struct file *file,
                                    struct ctl_table *table)
        bool ret = true;
        head = sysctl_head_grab(head);
+       if (IS_ERR(head))
+               return false;
        if (S_ISLNK(table->mode)) {
                /* It is not an error if we can not follow the link ignore it */