From patchwork Tue Apr 14 11:35:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 11487289 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 69BED912 for ; Tue, 14 Apr 2020 11:36:58 +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 4F8912075E for ; Tue, 14 Apr 2020 11:36:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4F8912075E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jOJqT-0003fi-0m; Tue, 14 Apr 2020 11:35:13 +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.89) (envelope-from ) id 1jOJqR-0003fX-2c for xen-devel@lists.xenproject.org; Tue, 14 Apr 2020 11:35:11 +0000 X-Inumbo-ID: ff2aa302-7e43-11ea-8926-12813bfff9fa Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id ff2aa302-7e43-11ea-8926-12813bfff9fa; Tue, 14 Apr 2020 11:35:10 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 8EC13AD0F; Tue, 14 Apr 2020 11:35:08 +0000 (UTC) Subject: [PATCH v2 2/2] x86: validate VM assist value in arch_set_info_guest() From: Jan Beulich To: "xen-devel@lists.xenproject.org" References: <51dfb592-2653-738f-6933-9521ffa4fecd@suse.com> Message-ID: Date: Tue, 14 Apr 2020 13:35:09 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <51dfb592-2653-738f-6933-9521ffa4fecd@suse.com> Content-Language: en-US X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Andrew Cooper , Wei Liu , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" While I can't spot anything that would go wrong, just like the respective hypercall only permits applicable bits to be set, we should also do so when loading guest context. Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- I'd like to note that Arm lacks a field to save/restore vm_assist. --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -932,6 +932,9 @@ int arch_set_info_guest( } } + if ( v->vcpu_id == 0 && (c(vm_assist) & ~arch_vm_assist_valid(d)) ) + return -EINVAL; + if ( is_hvm_domain(d) ) { for ( i = 0; i < ARRAY_SIZE(v->arch.dr); ++i )