From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Thu, 18 Feb 2016 14:10:07 +0000 (+0100)
Subject: x86: fix unintended fallthrough case from XSA-154
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~1722
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8dd6d1c099865ee5f5916616a0ca79cd943c46f9;p=xen.git

x86: fix unintended fallthrough case from XSA-154

... 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>
---

diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index ee0ddff9c6..ea3f9f2353 100644
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -925,9 +925,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();
             }