Message ID | 20170606135629.31664-4-cdall@linaro.org |
---|---|
State | Superseded |
Headers | show
Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp1433281qgd; Tue, 6 Jun 2017 06:56:55 -0700 (PDT) X-Received: by 10.98.13.138 with SMTP id 10mr4761539pfn.218.1496757415743; Tue, 06 Jun 2017 06:56:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496757415; cv=none; d=google.com; s=arc-20160816; b=tjwgTLjRgGw/ice/AaKLQNuDiTkEDkFfKhcTQLuqwEuS1MvLa3lvCGUVpHQM7hdjHX WzvmgY89cWodPbY2TEvjxMOZjJiYkdnx+9s0c47kR1x2TVvXTMkGM1jAX7BVmtX8yG7w Crkg7riTD/KCRF5n6kQknXmgiNR4hQZ1e9lEBur6Bh8LrA7ATlhAxvCeLHL9FjKHe57E C+AVw0YjDdOohcjpsHaqn7V4LtFvvVHRWQNQVyFlTp1/JK/ke2dIAksLSn2QxSVwceev iS4xa8O4q5AQbkaWUmVNQRVuPnakiwd44eP8ZRVyvQAj+Fi5pE4ddG4OmrS1TTpqKF8H ubmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=S5X4aVMVwKwyxCJ1P/KCFfH7YvSJsKAmtf5ebjhgSb8=; b=mdIwKGa1x3NtPSZJnbTLYt9Ejf4PY1xr0Wla1Y3v9Y+1DJ6wsErDJM0+EFrWFBUSOw MRA1isQoOTolKgkJgRvlkwm1JR/w1avYzBjxTXmbbbg+TSq4rDPQLlG2+5nwynFTgBN6 xQEF6Te6ohYv9h5ul1AffpKt6ZzDpJHnc/foZ8rmawrQ12X/nIZ/mLbthy27z8pdA66H +tmGUuqt4gawdLVr+DVrMN14dTgnKHPMEf6cITtCJLeEnstGKheC8d8KrgJ5HnZtq13+ tYg6Hwt0lGP/pTgl7+k9YaFpdJwWG0UxR75wVTR+pkno2rR6Fxu7IyY4E8XIYvPhcPIK ZYrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: <stable-owner@vger.kernel.org> Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m9si10263366plk.368.2017.06.06.06.56.55; Tue, 06 Jun 2017 06:56:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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=@linaro.org; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751388AbdFFN4y (ORCPT <rfc822;sumit.semwal@linaro.org> + 6 others); Tue, 6 Jun 2017 09:56:54 -0400 Received: from mail-wm0-f47.google.com ([74.125.82.47]:37607 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751474AbdFFN4t (ORCPT <rfc822;stable@vger.kernel.org>); Tue, 6 Jun 2017 09:56:49 -0400 Received: by mail-wm0-f47.google.com with SMTP id d73so49537497wma.0 for <stable@vger.kernel.org>; Tue, 06 Jun 2017 06:56:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=S5X4aVMVwKwyxCJ1P/KCFfH7YvSJsKAmtf5ebjhgSb8=; b=G9mB47gw8S4NY4d6ZVWcOcoUN6/qEdaxQwY8u19/rXdq71M7ccU19BToNemDdWXZ95 Hml4ayt+gpRtF7506uYW1TLRJQoddaAMvmXdJsN24h5x9kceUqVXkEUfFBBPn+pb0boN FvnjotUmAMpCPqYXg+8Bn09BHwmVganuzqO4s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=S5X4aVMVwKwyxCJ1P/KCFfH7YvSJsKAmtf5ebjhgSb8=; b=P1lLrG9d+IVZ6ndN73elhLWIQMOohzqwkIiIumfpQpeU7ib1CSF6M4xaj9FDrOGYLQ 99SVe+6qvUyEW83RojZao37Tp3ZLxZY8L2it5C2W2qwRivez0Qmj7E/ARNbtavAD8acV lQR5diFvJMTt0QEQnR9xQ4Plu2YZ6iJIjP7o9tnMJhU15xFwqvLIKm9VayVzEzYIjVxl 4QhaaTyIgTvt/XkvsI1/BD052aOXbfwaR947NyY9qW3R05+wEe0Pee/9pYt2rdNj8+GC +11FeYy1Jt+w9qS4ATwSnZvuFxfGiJn8tY2h2zVTMJZpgrEasTxnlMZ6X4oWDvnBzAD1 wXSQ== X-Gm-Message-State: AODbwcCPiAZ7YVFmgz2YsgGupKadrEIawHb9sMpLK3h2Ss56vfNDkc8e mQvsqZrMXIgENPaN X-Received: by 10.80.137.136 with SMTP id g8mr12670336edg.125.1496757408148; Tue, 06 Jun 2017 06:56:48 -0700 (PDT) Received: from localhost.localdomain (xd93ddc2d.cust.hiper.dk. [217.61.220.45]) by smtp.gmail.com with ESMTPSA id b30sm14791532edd.6.2017.06.06.06.56.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Jun 2017 06:56:47 -0700 (PDT) From: Christoffer Dall <cdall@linaro.org> To: Paolo Bonzini <pbonzini@redhat.com>, =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= <rkrcmar@redhat.com> Cc: Marc Zyngier <marc.zyngier@arm.com>, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, stable@vger.kernel.org, Christoffer Dall <cdall@linaro.org> Subject: [PULL 3/3] KVM: arm/arm64: Handle possible NULL stage2 pud when ageing pages Date: Tue, 6 Jun 2017 15:56:29 +0200 Message-Id: <20170606135629.31664-4-cdall@linaro.org> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170606135629.31664-1-cdall@linaro.org> References: <20170606135629.31664-1-cdall@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
diff --git a/virt/kvm/arm/mmu.c b/virt/kvm/arm/mmu.c index a2d6324..e2e5eff 100644 --- a/virt/kvm/arm/mmu.c +++ b/virt/kvm/arm/mmu.c @@ -879,6 +879,9 @@ static pmd_t *stage2_get_pmd(struct kvm *kvm, struct kvm_mmu_memory_cache *cache pmd_t *pmd; pud = stage2_get_pud(kvm, cache, addr); + if (!pud) + return NULL; + if (stage2_pud_none(*pud)) { if (!cache) return NULL;