36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
|
From 4c2fce28b205a0912f1224bdb8dbba2a0d7bf593 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Prasad J Pandit <pjp@fedoraproject.org>
|
||
|
|
Date: Thu, 7 Apr 2016 12:50:08 +0530
|
||
|
|
Subject: [PATCH] i386: kvmvapic: initialise imm32 variable
|
||
|
|
|
||
|
|
When processing Task Priorty Register(TPR) access, it could leak
|
||
|
|
automatic stack variable 'imm32' in patch_instruction().
|
||
|
|
Initialise the variable to avoid it.
|
||
|
|
|
||
|
|
Reported by: Donghai Zdh <donghai.zdh@alibaba-inc.com>
|
||
|
|
Cc: qemu-stable@nongnu.org
|
||
|
|
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
|
||
|
|
Message-Id: <1460013608-16670-1-git-send-email-ppandit@redhat.com>
|
||
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
|
||
|
|
(cherry picked from commit 691a02e2ce0c413236a78dee6f2651c937b09fb0)
|
||
|
|
[BR: BSC#975700 CVE-2016-4020]
|
||
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
||
|
|
---
|
||
|
|
hw/i386/kvmvapic.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c
|
||
|
|
index c69f374..ff1e31a 100644
|
||
|
|
--- a/hw/i386/kvmvapic.c
|
||
|
|
+++ b/hw/i386/kvmvapic.c
|
||
|
|
@@ -394,7 +394,7 @@ static void patch_instruction(VAPICROMState *s, X86CPU *cpu, target_ulong ip)
|
||
|
|
CPUX86State *env = &cpu->env;
|
||
|
|
VAPICHandlers *handlers;
|
||
|
|
uint8_t opcode[2];
|
||
|
|
- uint32_t imm32;
|
||
|
|
+ uint32_t imm32 = 0;
|
||
|
|
target_ulong current_pc = 0;
|
||
|
|
target_ulong current_cs_base = 0;
|
||
|
|
int current_flags = 0;
|