32 lines
1.0 KiB
Diff
32 lines
1.0 KiB
Diff
|
Subject: x86: fix unintended fallthrough case from XSA-154
|
||
|
|
From: Andrew Cooper andrew.cooper3@citrix.com Thu Feb 18 15:10:07 2016 +0100
|
||
|
|
Date: Thu Feb 18 15:10:07 2016 +0100:
|
||
|
|
Git: 8dd6d1c099865ee5f5916616a0ca79cd943c46f9
|
||
|
|
|
||
|
|
... and annotate the other deliberate one: Coverity objects otherwise.
|
||
|
|
|
||
|
|
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
|
||
|
|
|
||
|
|
One of the two instances was actually a bug.
|
||
|
|
|
||
|
|
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
||
|
|
|
||
|
|
Index: xen-4.6.1-testing/xen/arch/x86/mm.c
|
||
|
|
===================================================================
|
||
|
|
--- xen-4.6.1-testing.orig/xen/arch/x86/mm.c
|
||
|
|
+++ xen-4.6.1-testing/xen/arch/x86/mm.c
|
||
|
|
@@ -853,9 +853,11 @@ get_page_from_l1e(
|
||
|
|
case 0:
|
||
|
|
break;
|
||
|
|
case 1:
|
||
|
|
- if ( is_hardware_domain(l1e_owner) )
|
||
|
|
+ if ( !is_hardware_domain(l1e_owner) )
|
||
|
|
+ break;
|
||
|
|
+ /* fallthrough */
|
||
|
|
case -1:
|
||
|
|
- return 0;
|
||
|
|
+ return 0;
|
||
|
|
default:
|
||
|
|
ASSERT_UNREACHABLE();
|
||
|
|
}
|