diff options
| author | Dan Carpenter <[email protected]> | 2019-04-04 15:12:17 +0000 |
|---|---|---|
| committer | Juergen Gross <[email protected]> | 2019-04-05 06:42:45 +0000 |
| commit | 42d8644bd77dd2d747e004e367cb0c895a606f39 (patch) | |
| tree | cd9e5755de282db44f8995eb87b6f3a134cf7ef7 /arch/x86/include/asm/xen/hypercall.h | |
| parent | xen: use struct_size() helper in kzalloc() (diff) | |
| download | kernel-42d8644bd77dd2d747e004e367cb0c895a606f39.tar.gz kernel-42d8644bd77dd2d747e004e367cb0c895a606f39.zip | |
xen: Prevent buffer overflow in privcmd ioctl
The "call" variable comes from the user in privcmd_ioctl_hypercall().
It's an offset into the hypercall_page[] which has (PAGE_SIZE / 32)
elements. We need to put an upper bound on it to prevent an out of
bounds access.
Cc: [email protected]
Fixes: 1246ae0bb992 ("xen: add variable hypercall caller")
Signed-off-by: Dan Carpenter <[email protected]>
Reviewed-by: Boris Ostrovsky <[email protected]>
Signed-off-by: Juergen Gross <[email protected]>
Diffstat (limited to 'arch/x86/include/asm/xen/hypercall.h')
| -rw-r--r-- | arch/x86/include/asm/xen/hypercall.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h index de6f0d59a24f..2863c2026655 100644 --- a/arch/x86/include/asm/xen/hypercall.h +++ b/arch/x86/include/asm/xen/hypercall.h @@ -206,6 +206,9 @@ xen_single_call(unsigned int call, __HYPERCALL_DECLS; __HYPERCALL_5ARG(a1, a2, a3, a4, a5); + if (call >= PAGE_SIZE / sizeof(hypercall_page[0])) + return -EINVAL; + asm volatile(CALL_NOSPEC : __HYPERCALL_5PARAM : [thunk_target] "a" (&hypercall_page[call]) |