a4d1d9fe03
bnc#828623 - bnc#839596 - VUL-0: CVE-2013-1442: XSA-62: xen: Information leak on AVX and/or LWP capable CPUs 5242a1b5-x86-xsave-initialize-extended-register-state-when-guests-enable-it.patch - bnc#840592 - VUL-0: CVE-2013-4355: XSA-63: xen: Information leaks through I/O instruction emulation CVE-2013-4355-xsa63.patch - bnc#840593 - VUL-0: CVE-2013-4356: XSA-64: xen: Memory accessible by 64-bit PV guests under live migration CVE-2013-4356-xsa64.patch - bnc#841766 - VUL-1: CVE-2013-4361: XSA-66: xen: Information leak through fbld instruction emulation CVE-2013-4361-xsa66.patch - bnc#833796 - L3: Xen: migration broken from xsave-capable to xsave-incapable host 52205e27-x86-xsave-initialization-improvements.patch 522dc0e6-x86-xsave-fix-migration-from-xsave-capable-to-xsave-incapable-host.patch - bnc#839600 - [HP BCS SLES11 Bug]: In HP’s UEFI x86_64 platform and sles11sp3 with xen environment, xen hypervisor will panic on multiple blades nPar. 523172d5-x86-fix-memory-cut-off-when-using-PFN-compression.patch - bnc#833251 - [HP BCS SLES11 Bug]: In HP’s UEFI x86_64 platform and with xen environment, in booting stage ,xen hypervisor will panic. 522d896b-x86-EFI-properly-handle-run-time-memory-regions-outside-the-1-1-map.patch - bnc#834751 - [HP BCS SLES11 Bug]: In xen, “shutdown –y 0 –h” cannot power off system 522d896b-x86-EFI-properly-handle-run-time-memory-regions-outside-the-1-1-map.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=274
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
# Commit 9e2c5938246546a5b3f698b7421640d85602b994
|
|
# Date 2013-08-28 10:18:39 +0200
|
|
# Author Tomasz Wroblewski <tomasz.wroblewski@citrix.com>
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
|
Fix inactive timer list corruption on second S3 resume
|
|
|
|
init_timer cannot be safely called multiple times on same timer since it does memset(0)
|
|
on the structure, erasing the auxiliary member used by linked list code. This breaks
|
|
inactive timer list in common/timer.c.
|
|
|
|
Moved resume_timer initialisation to ns16550_init_postirq, so it's only done once.
|
|
|
|
Signed-off-by: Tomasz Wroblewski <tomasz.wroblewski@citrix.com>
|
|
Acked-by: Keir Fraser <keir@xen.org>
|
|
|
|
--- a/xen/drivers/char/ns16550.c
|
|
+++ b/xen/drivers/char/ns16550.c
|
|
@@ -128,6 +128,8 @@ static struct ns16550 {
|
|
#define RESUME_DELAY MILLISECS(10)
|
|
#define RESUME_RETRIES 100
|
|
|
|
+static void ns16550_delayed_resume(void *data);
|
|
+
|
|
static char ns_read_reg(struct ns16550 *uart, int reg)
|
|
{
|
|
if ( uart->remapped_io_base == NULL )
|
|
@@ -323,6 +325,7 @@ static void __init ns16550_init_postirq(
|
|
serial_async_transmit(port);
|
|
|
|
init_timer(&uart->timer, ns16550_poll, port, 0);
|
|
+ init_timer(&uart->resume_timer, ns16550_delayed_resume, port, 0);
|
|
|
|
/* Calculate time to fill RX FIFO and/or empty TX FIFO for polling. */
|
|
bits = uart->data_bits + uart->stop_bits + !!uart->parity;
|
|
@@ -413,7 +416,6 @@ static void ns16550_resume(struct serial
|
|
if ( ns16550_ioport_invalid(uart) )
|
|
{
|
|
delayed_resume_tries = RESUME_RETRIES;
|
|
- init_timer(&uart->resume_timer, ns16550_delayed_resume, port, 0);
|
|
set_timer(&uart->resume_timer, NOW() + RESUME_DELAY);
|
|
}
|
|
else
|