1369de9828
CVE-2014-3689 vmware_vga: insufficient parameter validation in rectangle functions (bz #1153038, bz #1153035)
38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
From: =?UTF-8?q?Beno=C3=AEt=20Canet?= <benoit.canet@irqsave.net>
|
|
Date: Sat, 12 Apr 2014 22:59:50 +0200
|
|
Subject: [PATCH] ide: Correct improper smart self test counter reset in ide
|
|
core.
|
|
|
|
The SMART self test counter was incorrectly being reset to zero,
|
|
not 1. This had the effect that on every 21st SMART EXECUTE OFFLINE:
|
|
* We would write off the beginning of a dynamically allocated buffer
|
|
* We forgot the SMART history
|
|
Fix this.
|
|
|
|
Signed-off-by: Benoit Canet <benoit@irqsave.net>
|
|
Message-id: 1397336390-24664-1-git-send-email-benoit.canet@irqsave.net
|
|
Reviewed-by: Markus Armbruster <armbru@redhat.com>
|
|
Cc: qemu-stable@nongnu.org
|
|
Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
[PMM: tweaked commit message as per suggestions from Markus]
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
|
|
(cherry picked from commit 940973ae0b45c9b6817bab8e4cf4df99a9ef83d7)
|
|
---
|
|
hw/ide/core.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/ide/core.c b/hw/ide/core.c
|
|
index a73af72..3fe67ca 100644
|
|
--- a/hw/ide/core.c
|
|
+++ b/hw/ide/core.c
|
|
@@ -1601,7 +1601,7 @@ static bool cmd_smart(IDEState *s, uint8_t cmd)
|
|
case 2: /* extended self test */
|
|
s->smart_selftest_count++;
|
|
if (s->smart_selftest_count > 21) {
|
|
- s->smart_selftest_count = 0;
|
|
+ s->smart_selftest_count = 1;
|
|
}
|
|
n = 2 + (s->smart_selftest_count - 1) * 24;
|
|
s->smart_selftest_data[n] = s->sector;
|