[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/17] target-i386: Fixed syscall posssible segfault
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 14/17] target-i386: Fixed syscall posssible segfault |
Date: |
Thu, 15 Sep 2016 16:21:53 +0200 |
From: Stanislav Shmarov <address@hidden>
In user-mode emulation env->idt.base memory is
allocated in linux-user/main.c with
size 8*512 = 4096 (for 64-bit).
When fake interrupt EXCP_SYSCALL is thrown
do_interrupt_user checks destination privilege level
for this fake exception, and tries to read 4 bytes
at address base + (256 * 2^4)=4096, that causes
segfault.
Privlege level was checked only for int's, so lets
read dpl from memory only for this case.
Signed-off-by: Stanislav Shmarov <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
target-i386/seg_helper.c | 36 +++++++++++++++++++-----------------
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/target-i386/seg_helper.c b/target-i386/seg_helper.c
index 6cbdf17..fb79f31 100644
--- a/target-i386/seg_helper.c
+++ b/target-i386/seg_helper.c
@@ -1137,25 +1137,27 @@ static void do_interrupt_real(CPUX86State *env, int
intno, int is_int,
static void do_interrupt_user(CPUX86State *env, int intno, int is_int,
int error_code, target_ulong next_eip)
{
- SegmentCache *dt;
- target_ulong ptr;
- int dpl, cpl, shift;
- uint32_t e2;
+ if (is_int) {
+ SegmentCache *dt;
+ target_ulong ptr;
+ int dpl, cpl, shift;
+ uint32_t e2;
- dt = &env->idt;
- if (env->hflags & HF_LMA_MASK) {
- shift = 4;
- } else {
- shift = 3;
- }
- ptr = dt->base + (intno << shift);
- e2 = cpu_ldl_kernel(env, ptr + 4);
+ dt = &env->idt;
+ if (env->hflags & HF_LMA_MASK) {
+ shift = 4;
+ } else {
+ shift = 3;
+ }
+ ptr = dt->base + (intno << shift);
+ e2 = cpu_ldl_kernel(env, ptr + 4);
- dpl = (e2 >> DESC_DPL_SHIFT) & 3;
- cpl = env->hflags & HF_CPL_MASK;
- /* check privilege if software int */
- if (is_int && dpl < cpl) {
- raise_exception_err(env, EXCP0D_GPF, (intno << shift) + 2);
+ dpl = (e2 >> DESC_DPL_SHIFT) & 3;
+ cpl = env->hflags & HF_CPL_MASK;
+ /* check privilege if software int */
+ if (dpl < cpl) {
+ raise_exception_err(env, EXCP0D_GPF, (intno << shift) + 2);
+ }
}
/* Since we emulate only user space, we cannot do more than
--
1.8.3.1
- [Qemu-devel] [PULL 04/17] cutils: Rewrite x86 buffer zero checking, (continued)
- [Qemu-devel] [PULL 04/17] cutils: Rewrite x86 buffer zero checking, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 05/17] Change net/socket.c to use socket_*() functions, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 06/17] memory: remove memory_region_destructor_rom_device, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 07/17] scsi: pvscsi: limit process IO loop to ring size, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 08/17] pc: apic: fix touch LAPIC when irqchip is split, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 09/17] target-i386: fix ordering of fields in CPUX86State, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 10/17] linux-user: complete omission of removing uses of strdup, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 11/17] build-sys: add make 'help' target, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 12/17] qemu-char: avoid segfault if user lacks of permisson of a given logfile, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 13/17] log: fix parsing of multiple trace:PATTERN log args, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 14/17] target-i386: Fixed syscall posssible segfault,
Paolo Bonzini <=
- [Qemu-devel] [PULL 15/17] pc: apic: introduce APIC macro, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 16/17] kvmvapic: fix state change handler, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 17/17] pcspk: adding vmstate for save/restore, Paolo Bonzini, 2016/09/15
- Re: [Qemu-devel] [PULL 00/17] Second batch of misc patches for QEMU 2.8, no-reply, 2016/09/15
- Re: [Qemu-devel] [PULL 00/17] Second batch of misc patches for QEMU 2.8, Peter Maydell, 2016/09/15