41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
|
Reference: bsc#960093 CVE-2015-8615 XSA-169
|
||
|
|
|
||
|
|
Subject: x86: make debug output consistent in hvm_set_callback_via
|
||
|
|
From: Malcolm Crossley malcolm.crossley@citrix.com Mon Dec 21 13:40:48 2015 +0100
|
||
|
|
Date: Mon Dec 21 13:40:48 2015 +0100:
|
||
|
|
Git: 5c1048565ba5b240f47203bdb67572bee73d639e
|
||
|
|
|
||
|
|
The unconditional printks in the switch statement of the
|
||
|
|
hvm_set_callback_via function results in Xen log spam in non debug
|
||
|
|
versions of Xen. The printks are for debug output only so conditionally
|
||
|
|
compile the entire switch statement on debug versions of Xen only.
|
||
|
|
|
||
|
|
This is XSA-169.
|
||
|
|
|
||
|
|
Signed-off-by: Malcolm Crossley <malcolm.crossley@citrix.com>
|
||
|
|
Reviewed-by: Jan Beulich <jbeulich@suse.com>
|
||
|
|
Acked-by: Ian Campbell <ian.campbell@citrix.com>
|
||
|
|
|
||
|
|
Index: xen-4.6.0-testing/xen/arch/x86/hvm/irq.c
|
||
|
|
===================================================================
|
||
|
|
--- xen-4.6.0-testing.orig/xen/arch/x86/hvm/irq.c
|
||
|
|
+++ xen-4.6.0-testing/xen/arch/x86/hvm/irq.c
|
||
|
|
@@ -382,7 +382,8 @@ void hvm_set_callback_via(struct domain
|
||
|
|
|
||
|
|
spin_unlock(&d->arch.hvm_domain.irq_lock);
|
||
|
|
|
||
|
|
- dprintk(XENLOG_G_INFO, "Dom%u callback via changed to ", d->domain_id);
|
||
|
|
+#ifndef NDEBUG
|
||
|
|
+ printk(XENLOG_G_INFO "Dom%u callback via changed to ", d->domain_id);
|
||
|
|
switch ( via_type )
|
||
|
|
{
|
||
|
|
case HVMIRQ_callback_gsi:
|
||
|
|
@@ -398,6 +399,7 @@ void hvm_set_callback_via(struct domain
|
||
|
|
printk("None\n");
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
+#endif
|
||
|
|
}
|
||
|
|
|
||
|
|
struct hvm_intack hvm_vcpu_has_pending_irq(struct vcpu *v)
|