diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2019-04-04 18:12:17 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-17 08:38:53 +0200 |
| commit | ed3adb562fc8ee9dac558bc7048e73abec943c62 (patch) | |
| tree | 012b05149fb153a760a4623c9b734412242ed622 /arch | |
| parent | 84c6c2af4c532dc3ce26d5c3f5e8b0824ac6b441 (diff) | |
| download | linux-stable-ed3adb562fc8ee9dac558bc7048e73abec943c62.tar.gz linux-stable-ed3adb562fc8ee9dac558bc7048e73abec943c62.tar.bz2 linux-stable-ed3adb562fc8ee9dac558bc7048e73abec943c62.zip | |
xen: Prevent buffer overflow in privcmd ioctl
commit 42d8644bd77dd2d747e004e367cb0c895a606f39 upstream.
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: stable@vger.kernel.org
Fixes: 1246ae0bb992 ("xen: add variable hypercall caller")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
| -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 ef05bea7010d..6b5c710846f5 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]) |