[Xen-changelog] [xen stable-4.6] x86: fix unintended fallthrough case from XSA-154

[patchbot@xxxxxxx]

commit ec92e7c629a60adb1f32e47605cf8bdf9b6afd47
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Thu Feb 18 15:23:08 2016 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Feb 18 15:23:08 2016 +0100

    x86: fix unintended fallthrough case from XSA-154
    
    ... and annotate the other deliberate one: Coverity objects otherwise.
    
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    
    One of the two instances was actually a bug.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    master commit: 8dd6d1c099865ee5f5916616a0ca79cd943c46f9
    master date: 2016-02-18 15:10:07 +0100
---
 xen/arch/x86/mm.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index 63c9bcf..c8ca657 100644
--- a/xen/arch/x86/mm.c
+++ b/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();
             }
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.6

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog