diff options
author | Tudor Florea <tudor.florea@enea.com> | 2015-07-15 23:11:18 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-07-21 01:24:45 +0200 |
commit | 38657774707334618c35772a9acb7492742a28f6 (patch) | |
tree | 362a2de0b2632a446786d4783a918fc007ff4683 /meta | |
parent | 768478708d485028c33ce65edbf7e80c827b3c6b (diff) | |
download | poky-38657774707334618c35772a9acb7492742a28f6.tar.gz |
qemu: remove patch already applied
This fix a build issue for qemu package
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/qemu/files/ide-CVE-2014-2894.patch | 46 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu_1.7.2.bb | 4 |
2 files changed, 2 insertions, 48 deletions
diff --git a/meta/recipes-devtools/qemu/files/ide-CVE-2014-2894.patch b/meta/recipes-devtools/qemu/files/ide-CVE-2014-2894.patch deleted file mode 100644 index bd3566e282..0000000000 --- a/meta/recipes-devtools/qemu/files/ide-CVE-2014-2894.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | From c5dae2f4c50ef848f224da718154af4438862cdb Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Beno=C3=AEt=20Canet?= <benoit.canet@irqsave.net> | ||
3 | Date: Sat, 12 Apr 2014 22:59:50 +0200 | ||
4 | Subject: [PATCH] ide: Correct improper smart self test counter reset in ide | ||
5 | core. | ||
6 | |||
7 | The SMART self test counter was incorrectly being reset to zero, | ||
8 | not 1. This had the effect that on every 21st SMART EXECUTE OFFLINE: | ||
9 | * We would write off the beginning of a dynamically allocated buffer | ||
10 | * We forgot the SMART history | ||
11 | Fix this. | ||
12 | |||
13 | Signed-off-by: Benoit Canet <benoit@irqsave.net> | ||
14 | Message-id: 1397336390-24664-1-git-send-email-benoit.canet@irqsave.net | ||
15 | Reviewed-by: Markus Armbruster <armbru@redhat.com> | ||
16 | Cc: qemu-stable@nongnu.org | ||
17 | Acked-by: Kevin Wolf <kwolf@redhat.com> | ||
18 | [PMM: tweaked commit message as per suggestions from Markus] | ||
19 | Signed-off-by: Peter Maydell <peter.maydell@linaro.org> | ||
20 | |||
21 | Fixes CVE-2014-2894 | ||
22 | Upstream-Status: Backport | ||
23 | |||
24 | (cherry picked from commit 940973ae0b45c9b6817bab8e4cf4df99a9ef83d7) | ||
25 | Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> | ||
26 | Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> | ||
27 | --- | ||
28 | hw/ide/core.c | 2 +- | ||
29 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
30 | |||
31 | diff --git a/hw/ide/core.c b/hw/ide/core.c | ||
32 | index e1f4c33..6007f6f 100644 | ||
33 | --- a/hw/ide/core.c | ||
34 | +++ b/hw/ide/core.c | ||
35 | @@ -1601,7 +1601,7 @@ static bool cmd_smart(IDEState *s, uint8_t cmd) | ||
36 | case 2: /* extended self test */ | ||
37 | s->smart_selftest_count++; | ||
38 | if (s->smart_selftest_count > 21) { | ||
39 | - s->smart_selftest_count = 0; | ||
40 | + s->smart_selftest_count = 1; | ||
41 | } | ||
42 | n = 2 + (s->smart_selftest_count - 1) * 24; | ||
43 | s->smart_selftest_data[n] = s->sector; | ||
44 | -- | ||
45 | 1.9.1 | ||
46 | |||
diff --git a/meta/recipes-devtools/qemu/qemu_1.7.2.bb b/meta/recipes-devtools/qemu/qemu_1.7.2.bb index 3fa7f201b5..5602f81c10 100644 --- a/meta/recipes-devtools/qemu/qemu_1.7.2.bb +++ b/meta/recipes-devtools/qemu/qemu_1.7.2.bb | |||
@@ -6,13 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ | |||
6 | SRC_URI += "file://fxrstorssefix.patch \ | 6 | SRC_URI += "file://fxrstorssefix.patch \ |
7 | file://qemu-enlarge-env-entry-size.patch \ | 7 | file://qemu-enlarge-env-entry-size.patch \ |
8 | file://Qemu-Arm-versatilepb-Add-memory-size-checking.patch \ | 8 | file://Qemu-Arm-versatilepb-Add-memory-size-checking.patch \ |
9 | file://ide-CVE-2014-2894.patch \ | ||
10 | file://slirp-udp-NULL-pointer-dereference-CVE-2014-3640.patch \ | 9 | file://slirp-udp-NULL-pointer-dereference-CVE-2014-3640.patch \ |
11 | file://vmware-vga-CVE-2014-3689.patch \ | 10 | file://vmware-vga-CVE-2014-3689.patch \ |
12 | file://vmstate_xhci_event-CVE-2014-5263.patch \ | 11 | file://vmstate_xhci_event-CVE-2014-5263.patch \ |
13 | file://vnc-CVE-2014-7815.patch \ | 12 | file://vnc-CVE-2014-7815.patch \ |
14 | file://fdc-CVE-2015-3456.patch \ | 13 | file://fdc-CVE-2015-3456.patch \ |
15 | file://CVE-2014-7840.patch " | 14 | file://CVE-2014-7840.patch \ |
15 | " | ||
16 | 16 | ||
17 | SRC_URI_prepend = "http://wiki.qemu.org/download/qemu-${PV}.tar.bz2" | 17 | SRC_URI_prepend = "http://wiki.qemu.org/download/qemu-${PV}.tar.bz2" |
18 | SRC_URI[md5sum] = "a52e0acd37b0c9b06228fe98da0b1b43" | 18 | SRC_URI[md5sum] = "a52e0acd37b0c9b06228fe98da0b1b43" |