2983660f65
CVE-2013-4377: Fix crash when unplugging virtio devices (bz #1012633, bz #1012641) Fix 'new snapshot' slowness after the first snap (bz #988436) Fix 9pfs xattrs on kernel 3.11 (bz #1013676) CVE-2013-4344: buffer overflow in scsi_target_emulate_report_luns (bz #1015274, bz #1007330)
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From 2ffbe03e8bc8f330581e31537190949a9aba80c3 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= <hpoussin@reactos.org>
|
|
Date: Wed, 14 Aug 2013 11:49:04 +0200
|
|
Subject: [PATCH] adlib: sort offsets in portio registration
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This fixes the following assert when -device adlib is used:
|
|
ioport.c:240: portio_list_add: Assertion `pio->offset >= off_last' failed.
|
|
|
|
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
|
|
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
|
|
(cherry picked from commit 2b21fb57af305f17841d79e7e2e02ad1aec3f5ca)
|
|
|
|
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
---
|
|
hw/audio/adlib.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c
|
|
index 0421d47..db4a953 100644
|
|
--- a/hw/audio/adlib.c
|
|
+++ b/hw/audio/adlib.c
|
|
@@ -284,9 +284,9 @@ static void Adlib_fini (AdlibState *s)
|
|
}
|
|
|
|
static MemoryRegionPortio adlib_portio_list[] = {
|
|
- { 0x388, 4, 1, .read = adlib_read, .write = adlib_write, },
|
|
{ 0, 4, 1, .read = adlib_read, .write = adlib_write, },
|
|
{ 0, 2, 1, .read = adlib_read, .write = adlib_write, },
|
|
+ { 0x388, 4, 1, .read = adlib_read, .write = adlib_write, },
|
|
PORTIO_END_OF_LIST(),
|
|
};
|
|
|