Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp235652ybg; Thu, 17 Oct 2019 22:07:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqxBFas+3ZnByWqovBLxBEKzH/CCcsY4/2wbpQ+0PB6dxFKcYXyC73JDaJyLA37++RjrrEGv X-Received: by 2002:a50:9f68:: with SMTP id b95mr7526708edf.301.1571375231902; Thu, 17 Oct 2019 22:07:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571375231; cv=none; d=google.com; s=arc-20160816; b=tA5urpaax956V++a7kUPyo54+WoP95JqL+m0YDy+coTvx3Zka+bfHukcF7nr8+GDjK 7ApbhbuA76j/qWk5qfsWBone0ThD/aQ7xD1usDRvJ8nR0kPmhT3BRwmyI1KF5h9FZRn4 vWyZH/Fc/iUXWYhLhyHqH41xW/Bkbq48s5TvCyvWOwUtc/SQim0tuv54Vx53SHCtmv/M u7BmXQmXwimTKFNH/estTBjfHbHDuBSsgkK/TV/ybCDq7wZ17Q3PFekeTKcvfevY8Stq XmotrtC51mF/HCRWZ/3EWJBjxiHbHowtVC3RSEpYQQcpwwrzuR0CSpX1898ClxsHp1EX d07g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qwywnNGTS05JaOi9jYH6NW5biSCrtEF92omZxDVo2wU=; b=s67nisTPryPYYiMmgKP9qCUzd5ITx80821MgW9NFSBihI89kY8RUXlQAiGwDke4b5Y M527UofQDforGfEBEAFIDyZAJFKyFV+kOqNAlgws3AvKCrI/sP5aC4t5/PicfvcqBiSV mHx7fR+2QCNfwehFtuKKyj2CO7U1qX6vosfxnHxwPaPZTT2X64jjIEfXVp6xw338y1Hy uBiUN7xkYHlpZ59MiX5GlagW+O4q+7XONFj3ky6DvuY8CCZGa86BrjdRJyuKRG6asAKP 1WsX59of/QStEuXtRWAayW7QmkwCi0E47+rZ5ENEY5zP1qBCbdkjN7WSYFjRR33VebCC GHTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=FrNQotg5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m10si2801727eds.428.2019.10.17.22.06.48; Thu, 17 Oct 2019 22:07:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=FrNQotg5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407618AbfJPWWN (ORCPT + 99 others); Wed, 16 Oct 2019 18:22:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:42084 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2437514AbfJPVxU (ORCPT ); Wed, 16 Oct 2019 17:53:20 -0400 Received: from localhost (unknown [192.55.54.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D3E3321925; Wed, 16 Oct 2019 21:53:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571262800; bh=xKZr8efP65BOVgy4lKJcwKHXDojZdGhvEWHWfdCt3is=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FrNQotg5JXgrNyRZR2GT+YC8qqRMxrjnyk6hKeUIljHbMXTCbCXH+bWAENhtWoJ3d NxrZ243eeGcUch43iPuFVnZTcOmXVvDfcOTr330woCua9DmiNaVXrArVDDr8VN3Qhi ujNu+GXQNmhlRj2kCV342+Wp9IjJr0GwMwzcMWec= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jack Wang , Paolo Bonzini Subject: [PATCH 4.4 05/79] KVM: nVMX: handle page fault in vmread fix Date: Wed, 16 Oct 2019 14:49:40 -0700 Message-Id: <20191016214734.133736745@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191016214729.758892904@linuxfoundation.org> References: <20191016214729.758892904@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jack Wang During backport f7eea636c3d5 ("KVM: nVMX: handle page fault in vmread"), there was a mistake the exception reference should be passed to function kvm_write_guest_virt_system, instead of NULL, other wise, we will get NULL pointer deref, eg kvm-unit-test triggered a NULL pointer deref below: [ 948.518437] kvm [24114]: vcpu0, guest rIP: 0x407ef9 kvm_set_msr_common: MSR_IA32_DEBUGCTLMSR 0x3, nop [ 949.106464] BUG: unable to handle kernel NULL pointer dereference at 0000000000000000 [ 949.106707] PGD 0 P4D 0 [ 949.106872] Oops: 0002 [#1] SMP [ 949.107038] CPU: 2 PID: 24126 Comm: qemu-2.7 Not tainted 4.19.77-pserver #4.19.77-1+feature+daily+update+20191005.1625+a4168bb~deb9 [ 949.107283] Hardware name: Dell Inc. Precision Tower 3620/09WH54, BIOS 2.7.3 01/31/2018 [ 949.107549] RIP: 0010:kvm_write_guest_virt_system+0x12/0x40 [kvm] [ 949.107719] Code: c0 5d 41 5c 41 5d 41 5e 83 f8 03 41 0f 94 c0 41 c1 e0 02 e9 b0 ed ff ff 0f 1f 44 00 00 48 89 f0 c6 87 59 56 00 00 01 48 89 d6 <49> c7 00 00 00 00 00 89 ca 49 c7 40 08 00 00 00 00 49 c7 40 10 00 [ 949.108044] RSP: 0018:ffffb31b0a953cb0 EFLAGS: 00010202 [ 949.108216] RAX: 000000000046b4d8 RBX: ffff9e9f415b0000 RCX: 0000000000000008 [ 949.108389] RDX: ffffb31b0a953cc0 RSI: ffffb31b0a953cc0 RDI: ffff9e9f415b0000 [ 949.108562] RBP: 00000000d2e14928 R08: 0000000000000000 R09: 0000000000000000 [ 949.108733] R10: 0000000000000000 R11: 0000000000000000 R12: ffffffffffffffc8 [ 949.108907] R13: 0000000000000002 R14: ffff9e9f4f26f2e8 R15: 0000000000000000 [ 949.109079] FS: 00007eff8694c700(0000) GS:ffff9e9f51a80000(0000) knlGS:0000000031415928 [ 949.109318] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 949.109495] CR2: 0000000000000000 CR3: 00000003be53b002 CR4: 00000000003626e0 [ 949.109671] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 949.109845] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 949.110017] Call Trace: [ 949.110186] handle_vmread+0x22b/0x2f0 [kvm_intel] [ 949.110356] ? vmexit_fill_RSB+0xc/0x30 [kvm_intel] [ 949.110549] kvm_arch_vcpu_ioctl_run+0xa98/0x1b30 [kvm] [ 949.110725] ? kvm_vcpu_ioctl+0x388/0x5d0 [kvm] [ 949.110901] kvm_vcpu_ioctl+0x388/0x5d0 [kvm] [ 949.111072] do_vfs_ioctl+0xa2/0x620 Signed-off-by: Jack Wang Acked-by: Paolo Bonzini --- arch/x86/kvm/vmx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -7276,7 +7276,7 @@ static int handle_vmread(struct kvm_vcpu /* _system ok, as nested_vmx_check_permission verified cpl=0 */ if (kvm_write_guest_virt_system(vcpu, gva, &field_value, (is_long_mode(vcpu) ? 8 : 4), - NULL)) + &e)) kvm_inject_page_fault(vcpu, &e); }