diff options
author | Alex Shi <alex.shi@linaro.org> | 2017-04-23 12:02:12 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-04-23 12:02:12 +0800 |
commit | c2a5f1f420a99274b988c928e67827fe7e5c911f (patch) | |
tree | b25b8abd4ba953fb97d4edac8639124ebaf1b57a /arch/x86/entry/vdso | |
parent | 28a457372dc97342e34690d08fb72bf539d12f86 (diff) | |
parent | 81af21fe95ba45261c7894b471e5d7698c4db8f1 (diff) |
Merge tag 'v4.4.63' into linux-linaro-lsk-v4.4
This is the 4.4.63 stable release
Diffstat (limited to 'arch/x86/entry/vdso')
-rw-r--r-- | arch/x86/entry/vdso/vdso32-setup.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/x86/entry/vdso/vdso32-setup.c b/arch/x86/entry/vdso/vdso32-setup.c index 08a317a9ae4b..a7508d7e20b7 100644 --- a/arch/x86/entry/vdso/vdso32-setup.c +++ b/arch/x86/entry/vdso/vdso32-setup.c @@ -31,8 +31,10 @@ static int __init vdso32_setup(char *s) { vdso32_enabled = simple_strtoul(s, NULL, 0); - if (vdso32_enabled > 1) + if (vdso32_enabled > 1) { pr_warn("vdso32 values other than 0 and 1 are no longer allowed; vdso disabled\n"); + vdso32_enabled = 0; + } return 1; } @@ -63,13 +65,18 @@ subsys_initcall(sysenter_setup); /* Register vsyscall32 into the ABI table */ #include <linux/sysctl.h> +static const int zero; +static const int one = 1; + static struct ctl_table abi_table2[] = { { .procname = "vsyscall32", .data = &vdso32_enabled, .maxlen = sizeof(int), .mode = 0644, - .proc_handler = proc_dointvec + .proc_handler = proc_dointvec_minmax, + .extra1 = (int *)&zero, + .extra2 = (int *)&one, }, {} }; |