From patchwork Sat Apr 16 13:31:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 12815829 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 1523EC433F5 for ; Sat, 16 Apr 2022 13:32:24 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.306276.521432 (Exim 4.92) (envelope-from ) id 1nfiWy-0002cA-EN; Sat, 16 Apr 2022 13:32:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 306276.521432; Sat, 16 Apr 2022 13:32:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nfiWy-0002c2-B9; Sat, 16 Apr 2022 13:32:04 +0000 Received: by outflank-mailman (input) for mailman id 306276; Sat, 16 Apr 2022 13:32:02 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nfiWw-0002bq-NE for xen-devel@lists.xenproject.org; Sat, 16 Apr 2022 13:32:02 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 98dce0fc-bd89-11ec-a405-831a346695d4; Sat, 16 Apr 2022 15:32:01 +0200 (CEST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 1080E215FD; Sat, 16 Apr 2022 13:32:01 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id B164913A5D; Sat, 16 Apr 2022 13:32:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id Exg2KVDFWmJCEQAAMHmgww (envelope-from ); Sat, 16 Apr 2022 13:32:00 +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" X-Inumbo-ID: 98dce0fc-bd89-11ec-a405-831a346695d4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1650115921; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=i2w0dpKapFbBkdrJeQ76OphKXR6E2VibjK4wYA3Bo4o=; b=babyk9Jk7OhmYmEzg7NumvI4PobmqO3xGmdru2QeTdz1GuPAJRi11orJazrXE/W713tbIO ZV7yqI9vMa2y0RrHjIsIRXW8xneVPhntiD1fYwqeG3SpMVFjsootepnXjNTspGwo8UUopn tm8Ok3+/9ixVsA0j8bU9gFKA1ogohpE= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Andrew Cooper , George Dunlap , Jan Beulich , Julien Grall , Stefano Stabellini , Wei Liu , Cheyenne Wills Subject: [PATCH] xen: fix XEN_DOMCTL_gdbsx_guestmemio crash Date: Sat, 16 Apr 2022 15:31:58 +0200 Message-Id: <20220416133158.16162-1-jgross@suse.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 A hypervisor built without CONFIG_GDBSX will crash in case the XEN_DOMCTL_gdbsx_guestmemio domctl is being called, as the call will end up in iommu_do_domctl() with d == NULL: (XEN) CPU: 6 (XEN) RIP: e008:[] iommu_do_domctl+0x4/0x30 (XEN) RFLAGS: 0000000000010202 CONTEXT: hypervisor (d0v0) (XEN) rax: 00000000000003e8 rbx: ffff830856277ef8 rcx: ffff830856277fff ... (XEN) Xen call trace: (XEN) [] R iommu_do_domctl+0x4/0x30 (XEN) [] S arch_do_domctl+0x7f/0x2330 (XEN) [] S do_domctl+0xe56/0x1930 (XEN) [] S do_domctl+0/0x1930 (XEN) [] S pv_hypercall+0x99/0x110 (XEN) [] S arch/x86/pv/domain.c#_toggle_guest_pt+0x11/0x90 (XEN) [] S lstar_enter+0x128/0x130 (XEN) (XEN) Pagetable walk from 0000000000000144: (XEN) L4[0x000] = 0000000000000000 ffffffffffffffff (XEN) (XEN) **************************************** (XEN) Panic on CPU 6: (XEN) FATAL PAGE FAULT (XEN) [error_code=0000] (XEN) Faulting linear address: 0000000000000144 Reported-by: Cheyenne Wills Fixes: e726a82ca0dc ("xen: make gdbsx support configurable") Signed-off-by: Juergen Gross --- xen/common/domctl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 57135d4478..5602dc6b34 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -308,7 +308,9 @@ long cf_check do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) if ( op->domain == DOMID_INVALID ) { case XEN_DOMCTL_createdomain: +#ifdef CONFIG_GDBSX case XEN_DOMCTL_gdbsx_guestmemio: +#endif d = NULL; break; }