From patchwork Tue Aug 9 12:48:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 9271141 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C01E460754 for ; Tue, 9 Aug 2016 13:33:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B1AD42835A for ; Tue, 9 Aug 2016 13:33:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A60E428383; Tue, 9 Aug 2016 13:33:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CF5172835A for ; Tue, 9 Aug 2016 13:33:38 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bX77i-0000bV-53; Tue, 09 Aug 2016 13:31:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bX77h-0000bO-4M for xen-devel@lists.xen.org; Tue, 09 Aug 2016 13:31:13 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 9F/1F-06162-02BD9A75; Tue, 09 Aug 2016 13:31:12 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprAIsWRWlGSWpSXmKPExsXitHRDpK787ZX hBu//21gs+biYxYHR4+ju30wBjFGsmXlJ+RUJrBkbJ81lL1gmVPFw1R/2BsZJ/F2MnBwSAv4S C7ZMZwSx2QT0JXa/+MQEYosIqEuc7rjI2sXIwcEsoCux6qcGSFgYqHzul03sIDaLgIrExsZFj CAlvAKeEq3/IiEmykmcP/6TGcTmFPCS2H9yGdBELg4hgQ5GiZkT7oP1CgmoSVzrvwRm8woISp yc+YQFxGYWkJA4+OIFM8Qgbonbp6cyT2Dkm4WkbBaSsgWMTKsYNYpTi8pSi3SNLPSSijLTM0p yEzNzdA0NjPVyU4uLE9NTcxKTivWS83M3MQJDqp6BgXEHY/sJv0OMkhxMSqK8/w6sDBfiS8pP qcxILM6ILyrNSS0+xCjDwaEkwXvtJlBOsCg1PbUiLTMHGNwwaQkOHiURXs5bQGne4oLE3OLMd IjUKUZFKXHelSB9AiCJjNI8uDZYRF1ilJUS5mVkYGAQ4ilILcrNLEGVf8UozsGoJMwrATKeJz OvBG76K6DFTECLk1RXgCwuSURISTUw7pQ4ER/CN0Uxbtnm5oOzk2sdGf5X3dfdHbvcumnPR7Y NKwT/6q2v/ibkZ3axwMJ691LufSJyFreMJhVcuxrqz9v8b/v3Bd5CX98tq8lZ9JI3mEdD+t8v /dpL+ioVOpGNW180Zl/acKKKM9/a+DmzyuaSx4k/yrLzpNZEzpGeLVrRWJKisPepEktxRqKhF nNRcSIARMXgpaMCAAA= X-Env-Sender: prvs=022dda640=Andrew.Cooper3@citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1470749469!54808785!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: 8.77; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17695 invoked from network); 9 Aug 2016 13:31:11 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-8.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 9 Aug 2016 13:31:11 -0000 X-IronPort-AV: E=Sophos;i="5.28,494,1464652800"; d="scan'208";a="371187010" From: Andrew Cooper To: Xen-devel Date: Tue, 9 Aug 2016 13:48:03 +0100 Message-ID: <1470746884-27118-2-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1470746884-27118-1-git-send-email-andrew.cooper3@citrix.com> References: <1470405013-18856-1-git-send-email-andrew.cooper3@citrix.com> <1470746884-27118-1-git-send-email-andrew.cooper3@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Andrew Cooper Subject: [Xen-devel] [PATCH] xen/x86: Avoid undefined behaviour by shifting into a sign bit X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich v2: * Use ~0u as opposed to -1u --- xen/arch/x86/apic.c | 2 +- xen/arch/x86/cpu/common.c | 2 +- xen/arch/x86/x86_64/traps.c | 2 +- xen/include/asm-x86/apicdef.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index f3727cd..3fb9a82 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -571,7 +571,7 @@ void setup_local_APIC(void) for (i = APIC_ISR_NR - 1; i >= 0; i--) { value = apic_read(APIC_ISR + i*0x10); for (j = 31; j >= 0; j--) { - if (value & (1<> ht_mask_width; + core_select_mask = (~(~0u << core_plus_mask_width)) >> ht_mask_width; c->cpu_core_id = phys_pkg_id(initial_apicid, ht_mask_width) & core_select_mask; diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 19f58a1..2d8ecf5 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -414,7 +414,7 @@ void subarch_percpu_traps_init(void) unmap_domain_page(stub_page); /* Common SYSCALL parameters. */ - wrmsr(MSR_STAR, 0, (FLAT_RING3_CS32<<16) | __HYPERVISOR_CS); + wrmsr(MSR_STAR, 0, ((unsigned int)FLAT_RING3_CS32 << 16) | __HYPERVISOR_CS); wrmsr(MSR_SYSCALL_MASK, XEN_SYSCALL_MASK, 0U); } diff --git a/xen/include/asm-x86/apicdef.h b/xen/include/asm-x86/apicdef.h index 8752287..da7f4d3 100644 --- a/xen/include/asm-x86/apicdef.h +++ b/xen/include/asm-x86/apicdef.h @@ -30,7 +30,7 @@ #define APIC_EIO_ACK 0x0 /* Write this to the EOI register */ #define APIC_RRR 0xC0 #define APIC_LDR 0xD0 -#define APIC_LDR_MASK (0xFF<<24) +#define APIC_LDR_MASK (0xFFu<<24) #define GET_xAPIC_LOGICAL_ID(x) (((x)>>24)&0xFF) #define SET_xAPIC_LOGICAL_ID(x) (((x)<<24)) #define APIC_ALL_CPUS 0xFF