Skip to content

Commit 1774379

Browse files
Muchun Songtorvalds
authored andcommitted
mm/hugetlb: fix a race between hugetlb sysctl handlers
There is a race between the assignment of `table->data` and write value to the pointer of `table->data` in the __do_proc_doulongvec_minmax() on the other thread. CPU0: CPU1: proc_sys_write hugetlb_sysctl_handler proc_sys_call_handler hugetlb_sysctl_handler_common hugetlb_sysctl_handler table->data = &tmp; hugetlb_sysctl_handler_common table->data = &tmp; proc_doulongvec_minmax do_proc_doulongvec_minmax sysctl_head_finish __do_proc_doulongvec_minmax unuse_table i = table->data; *i = val; // corrupt CPU1's stack Fix this by duplicating the `table`, and only update the duplicate of it. And introduce a helper of proc_hugetlb_doulongvec_minmax() to simplify the code. The following oops was seen: BUG: kernel NULL pointer dereference, address: 0000000000000000 #PF: supervisor instruction fetch in kernel mode #PF: error_code(0x0010) - not-present page Code: Bad RIP value. ... Call Trace: ? set_max_huge_pages+0x3da/0x4f0 ? alloc_pool_huge_page+0x150/0x150 ? proc_doulongvec_minmax+0x46/0x60 ? hugetlb_sysctl_handler_common+0x1c7/0x200 ? nr_hugepages_store+0x20/0x20 ? copy_fd_bitmaps+0x170/0x170 ? hugetlb_sysctl_handler+0x1e/0x20 ? proc_sys_call_handler+0x2f1/0x300 ? unregister_sysctl_table+0xb0/0xb0 ? __fd_install+0x78/0x100 ? proc_sys_write+0x14/0x20 ? __vfs_write+0x4d/0x90 ? vfs_write+0xef/0x240 ? ksys_write+0xc0/0x160 ? __ia32_sys_read+0x50/0x50 ? __close_fd+0x129/0x150 ? __x64_sys_write+0x43/0x50 ? do_syscall_64+0x6c/0x200 ? entry_SYSCALL_64_after_hwframe+0x44/0xa9 Fixes: e5ff215 ("hugetlb: multiple hstates for multiple page sizes") Signed-off-by: Muchun Song <songmuchun@bytedance.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com> Cc: Andi Kleen <ak@linux.intel.com> Link: http://lkml.kernel.org/r/20200828031146.43035-1-songmuchun@bytedance.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 953f064 commit 1774379

File tree

1 file changed

+20
-6
lines changed

1 file changed

+20
-6
lines changed

mm/hugetlb.c

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3465,6 +3465,22 @@ static unsigned int allowed_mems_nr(struct hstate *h)
34653465
}
34663466

34673467
#ifdef CONFIG_SYSCTL
3468+
static int proc_hugetlb_doulongvec_minmax(struct ctl_table *table, int write,
3469+
void *buffer, size_t *length,
3470+
loff_t *ppos, unsigned long *out)
3471+
{
3472+
struct ctl_table dup_table;
3473+
3474+
/*
3475+
* In order to avoid races with __do_proc_doulongvec_minmax(), we
3476+
* can duplicate the @table and alter the duplicate of it.
3477+
*/
3478+
dup_table = *table;
3479+
dup_table.data = out;
3480+
3481+
return proc_doulongvec_minmax(&dup_table, write, buffer, length, ppos);
3482+
}
3483+
34683484
static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
34693485
struct ctl_table *table, int write,
34703486
void *buffer, size_t *length, loff_t *ppos)
@@ -3476,9 +3492,8 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
34763492
if (!hugepages_supported())
34773493
return -EOPNOTSUPP;
34783494

3479-
table->data = &tmp;
3480-
table->maxlen = sizeof(unsigned long);
3481-
ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
3495+
ret = proc_hugetlb_doulongvec_minmax(table, write, buffer, length, ppos,
3496+
&tmp);
34823497
if (ret)
34833498
goto out;
34843499

@@ -3521,9 +3536,8 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
35213536
if (write && hstate_is_gigantic(h))
35223537
return -EINVAL;
35233538

3524-
table->data = &tmp;
3525-
table->maxlen = sizeof(unsigned long);
3526-
ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
3539+
ret = proc_hugetlb_doulongvec_minmax(table, write, buffer, length, ppos,
3540+
&tmp);
35273541
if (ret)
35283542
goto out;
35293543

0 commit comments

Comments
 (0)