Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 203C0C56201 for ; Thu, 19 Nov 2020 15:57:37 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8646322248 for ; Thu, 19 Nov 2020 15:57:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="LLQSGZkT" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8646322248 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.31022.61215 (Exim 4.92) (envelope-from ) id 1kfmJJ-0005G6-Im; Thu, 19 Nov 2020 15:57:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 31022.61215; Thu, 19 Nov 2020 15:57:25 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kfmJJ-0005Fz-Fr; Thu, 19 Nov 2020 15:57:25 +0000 Received: by outflank-mailman (input) for mailman id 31022; Thu, 19 Nov 2020 15:57:24 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kfmJI-0005Fu-A6 for xen-devel@lists.xenproject.org; Thu, 19 Nov 2020 15:57:24 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id f3867198-9c2b-432e-ada4-86bb1306e479; Thu, 19 Nov 2020 15:57:23 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id C9A0FABD6; Thu, 19 Nov 2020 15:57:22 +0000 (UTC) Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kfmJI-0005Fu-A6 for xen-devel@lists.xenproject.org; Thu, 19 Nov 2020 15:57:24 +0000 X-Inumbo-ID: f3867198-9c2b-432e-ada4-86bb1306e479 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id f3867198-9c2b-432e-ada4-86bb1306e479; Thu, 19 Nov 2020 15:57:23 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1605801442; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q8pTdAyL07uOku06xGXBXqPxNVKB/ssYIkgqBhIqPsU=; b=LLQSGZkT9aqqj2o8h+ACvcUTcwchDxG9wWIdn/N5GKlBQZpg1TmOJ8h/XPhaLaA7oWhuq3 VG/ig9UZs8oPWKlhcgiX8Jg0oo39BpGg5r6uj/1gXHE4RXu8oHTb+Vlx+rN+HFSTv0Us1s nsGTmEL6SbeQzoSjTzig8Un6NxwOe88= Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id C9A0FABD6; Thu, 19 Nov 2020 15:57:22 +0000 (UTC) To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper From: Jan Beulich Subject: [PATCH] SVM: avoid UB in intercept mask definitions Message-ID: Date: Thu, 19 Nov 2020 16:57:22 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.4.3 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Found by looking for patterns similar to the one Julien did spot in pci_vtd_quirks(). Signed-off-by: Jan Beulich --- a/xen/include/asm-x86/hvm/svm/vmcb.h +++ b/xen/include/asm-x86/hvm/svm/vmcb.h @@ -55,7 +55,7 @@ enum GenericIntercept1bits GENERAL1_INTERCEPT_MSR_PROT = 1 << 28, GENERAL1_INTERCEPT_TASK_SWITCH = 1 << 29, GENERAL1_INTERCEPT_FERR_FREEZE = 1 << 30, - GENERAL1_INTERCEPT_SHUTDOWN_EVT = 1 << 31 + GENERAL1_INTERCEPT_SHUTDOWN_EVT = 1u << 31 }; /* general 2 intercepts */ @@ -112,7 +112,7 @@ enum CRInterceptBits CR_INTERCEPT_CR12_WRITE = 1 << 28, CR_INTERCEPT_CR13_WRITE = 1 << 29, CR_INTERCEPT_CR14_WRITE = 1 << 30, - CR_INTERCEPT_CR15_WRITE = 1 << 31, + CR_INTERCEPT_CR15_WRITE = 1u << 31, }; @@ -150,7 +150,7 @@ enum DRInterceptBits DR_INTERCEPT_DR12_WRITE = 1 << 28, DR_INTERCEPT_DR13_WRITE = 1 << 29, DR_INTERCEPT_DR14_WRITE = 1 << 30, - DR_INTERCEPT_DR15_WRITE = 1 << 31, + DR_INTERCEPT_DR15_WRITE = 1u << 31, }; enum VMEXIT_EXITCODE