[119166] trunk/dports/emulators/qemu

[raimue at macports.org]

Revision: 119166
          https://trac.macports.org/changeset/119166
Author:   raimue at macports.org
Date:     2014-04-18 08:11:14 -0700 (Fri, 18 Apr 2014)
Log Message:
-----------
emulators/qemu:
Security update for CVE-2014-2894.

Modified Paths:
--------------
    trunk/dports/emulators/qemu/Portfile

Added Paths:
-----------
    trunk/dports/emulators/qemu/files/patch-smart-selftest-counter.diff

Modified: trunk/dports/emulators/qemu/Portfile
===================================================================
--- trunk/dports/emulators/qemu/Portfile	2014-04-18 11:17:53 UTC (rev 119165)
+++ trunk/dports/emulators/qemu/Portfile	2014-04-18 15:11:14 UTC (rev 119166)
@@ -4,7 +4,7 @@
 
 name                    qemu
 version                 1.7.1
-revision                1
+revision                2
 categories              emulators
 license                 GPL-2+
 platforms               darwin
@@ -23,7 +23,8 @@
 checksums               rmd160  911394542106b88ff44df410827aae4aad0cd096 \
                         sha256  d68942a004222eebae5d156ceefb308fabd98edb282d1dde49ec810bbf01bef4
 
-patchfiles              patch-configure.diff
+patchfiles              patch-configure.diff \
+                        patch-smart-selftest-counter.diff
 
 depends_build           port:texinfo \
                         port:libtool \

Added: trunk/dports/emulators/qemu/files/patch-smart-selftest-counter.diff
===================================================================
--- trunk/dports/emulators/qemu/files/patch-smart-selftest-counter.diff	                        (rev 0)
+++ trunk/dports/emulators/qemu/files/patch-smart-selftest-counter.diff	2014-04-18 15:11:14 UTC (rev 119166)
@@ -0,0 +1,42 @@
+Security-Report: http://seclists.org/oss-sec/2014/q2/116
+Security-CVE: CVE-2014-2894
+
+From 940973ae0b45c9b6817bab8e4cf4df99a9ef83d7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Beno=C3=AEt=20Canet?= <benoit.canet at 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 at irqsave.net>
+Message-id: 1397336390-24664-1-git-send-email-benoit.canet at irqsave.net
+Reviewed-by: Markus Armbruster <armbru at redhat.com>
+Cc: qemu-stable at nongnu.org
+Acked-by: Kevin Wolf <kwolf at redhat.com>
+[PMM: tweaked commit message as per suggestions from Markus]
+Signed-off-by: Peter Maydell <peter.maydell at linaro.org>
+---
+ hw/ide/core.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git hw/ide/core.c hw/ide/core.c
+index e1dfe54..c943a4d 100644
+--- hw/ide/core.c
++++ hw/ide/core.c
+@@ -1602,7 +1602,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;
+-- 
+1.9.2
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140418/e31a0698/attachment.html>