From patchwork Thu Feb 18 12:26:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 8349281 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id ECBDCC0553 for ; Thu, 18 Feb 2016 12:31:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3CC8020386 for ; Thu, 18 Feb 2016 12:31:59 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 63D372013A for ; Thu, 18 Feb 2016 12:31:58 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aWNi8-0007ke-H3; Thu, 18 Feb 2016 12:29:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aWNi7-0007kN-I4 for xen-devel@lists.xen.org; Thu, 18 Feb 2016 12:29:31 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 8D/E9-02987-A29B5C65; Thu, 18 Feb 2016 12:29:30 +0000 X-Env-Sender: prvs=8491ce0b8=Andrew.Cooper3@citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1455798568!23330041!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 52404 invoked from network); 18 Feb 2016 12:29:29 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-9.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 18 Feb 2016 12:29:29 -0000 X-IronPort-AV: E=Sophos;i="5.22,465,1449532800"; d="scan'208";a="332591421" From: Andrew Cooper To: Xen-devel Date: Thu, 18 Feb 2016 12:26:43 +0000 Message-ID: <1455798403-21953-1-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 X-DLP: MIA1 Cc: Andrew Cooper , Jan Beulich Subject: [Xen-devel] [PATCH] xen/x86: Annotate deliberate fallthrough cases from XSA-154 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Coverity objects otherwise. Signed-off-by: Andrew Cooper --- CC: Jan Beulich --- xen/arch/x86/mm.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index a05edc3..0bff7dd 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -924,10 +924,15 @@ get_page_from_l1e( { case 0: break; + case 1: if ( is_hardware_domain(l1e_owner) ) + { + /* Fallthrough. */ case -1: return 0; + } + /* Fallthrough. */ default: ASSERT_UNREACHABLE(); }