From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EF7E42206B8 for ; Thu, 9 Jan 2025 13:38:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736429911; cv=none; b=hWjt4CTjGHNjTAAqKVFdjzj4LchOdwlti2jo0Np1hb2a10rv+ziMicIf3wvjvWvPfwpLxuqxhM4K5xjfIt1Uh0Uqjzeu0hiTETlLDIKY7XdW9Kmn8T99HY0Rq3NuiKZni8qZBbykUH7Tdd1SzzBpPd7hZZqSxqa1lYmGORKuVf8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736429911; c=relaxed/simple; bh=gHVqbeeLDW26xdNiUZY5UzwMkP98DCAKakRVGGlY3Dg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GD3/AJ97BU6oqDXWj7fakRDTtsH7mwno2YBUbl99cvbIq2nhUI7dAC4aNiaL89PTmzyFzQKxRl8MESkUwUT81urh6yLyEXZTKCtcTlx2Q67YklTmqE7Q0Q01snceMrvYuKQ9r7WJqwjRZMQ3NFtnzj9jV7DcpXJM89YajH6wxSY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=i6aJ/6DZ; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="i6aJ/6DZ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736429907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+qIG/0LvnjXMgyU8eqBX8hgYV7UmJPw6Xa2UEwpxHJA=; b=i6aJ/6DZpAliazlCdP6HIkcqlH7wgjyiHB1T2zcCBqHH2EwtE41BEgcO6Dj5bs/TP4rwxZ lDMpg1gpG4RGN18UbN1DwwO88PldCQ2g7Ky2YAJECbYXuIrPYAWuBU2amCbiabm35yeRQJ sMj+IJg66OnKIJT+0uK4n+g4gUA+vtc= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-587-GiJUUv-HNSOiThf6aFWH0w-1; Thu, 09 Jan 2025 08:38:25 -0500 X-MC-Unique: GiJUUv-HNSOiThf6aFWH0w-1 X-Mimecast-MFC-AGG-ID: GiJUUv-HNSOiThf6aFWH0w Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-aa680e17f6dso75334466b.1 for ; Thu, 09 Jan 2025 05:38:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736429903; x=1737034703; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+qIG/0LvnjXMgyU8eqBX8hgYV7UmJPw6Xa2UEwpxHJA=; b=dM0POG98oVTmyYTZ8tzGtXIsEYOL7mc6ryjbU9l1S/1lhy2Lv4cKMQd/63HGXJAbkD mzMz5WyZjPochV8UV8ldfLFlYe2xtbsysFoWoLQwWwCsGDVTiUavb8yWjvX8W32KXRvn JqopU5Fit5QiXTv9usGhNJCdqNqHuY42vX03spSRat7T9r0ejBkTFJH4W6OTBlqQPaZw iULyQveWzvXwmMnLbpBFdrPBbjf0QJXit73VX+fDhGIFofNza3hB1lSH1g3FrzlE2Cm3 5/zl+/0ZMuOa8IeWbX7ZF1PzG7EHMyG2DFKhr0ArGFNgiE7bdqb17wbRk9wPF4HxNXmS CVfA== X-Gm-Message-State: AOJu0YwzdfkGmxxogFeDbHAdd4wygO7g8UbfFYxqyZIgIXkwKJwBr5eH gUIJ0DFEFF8KabOqkvfo4HLv7vjUXAt5dnL8ZKv7ckP33D/oEK+Vs3s0kd2rJ6jBQvrMUrbF4J4 M9CdVM3ZUIqOPS4m4Fzo+b8w+RY6Uegg9+RDXPCbxnAUdftm7MXU53dr0WKKDpGiHJho9Ns9LsJ kHiBoOm59XQ4hvzsQ/yRpCTiMa4D/CJrbISaJPJbVv69+GGgrY X-Gm-Gg: ASbGnctA+Nsh2TryXNKLJc+V++A9ns7Qf6KC+ZM4Y8jlhzl052O8Mv9LAJNF4ZJzUdS uSPztgzSXq4OJANpc0XLeRS8M5/fqMad4F0t/4OxTCzxOxFDK5AN7Q1ITJtkbriVX48KfMrDE8F 3XjZcK8th8QAO2S/8TAwwzFpsfU8aPWM/8RLHzSGv8pfAvMmujorI2AQ5nRGbG9UjQeVGgNtbwn sDehIv2H8WemvHZBKy4GG5DMThIUMWKsxA3x+Gv6TFEXa6TBxxl7xpMGOup X-Received: by 2002:a05:6402:3549:b0:5d0:e73c:b7f0 with SMTP id 4fb4d7f45d1cf-5d972e70945mr15040548a12.28.1736429903080; Thu, 09 Jan 2025 05:38:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IHsGUykWSOpesU6tHxPGZnO3JxPfRRnO6klBd/fYEFfPEHAwQWWT0oVTu7t2r5Sxoacsy+c3Q== X-Received: by 2002:a05:6402:3549:b0:5d0:e73c:b7f0 with SMTP id 4fb4d7f45d1cf-5d972e70945mr15040371a12.28.1736429901823; Thu, 09 Jan 2025 05:38:21 -0800 (PST) Received: from [192.168.10.47] ([151.62.105.73]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5d99008c366sm624477a12.17.2025.01.09.05.38.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2025 05:38:21 -0800 (PST) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: oliver.upton@linux.dev, Will Deacon , Anup Patel , Andrew Jones , seanjc@google.com, linuxppc-dev@lists.ozlabs.org, regressions@lists.linux.dev, stable@vger.kernel.org Subject: [PATCH 1/5] KVM: e500: retry if no memslot is found Date: Thu, 9 Jan 2025 14:38:13 +0100 Message-ID: <20250109133817.314401-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250109133817.314401-1-pbonzini@redhat.com> References: <20250109133817.314401-1-pbonzini@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Avoid a NULL pointer dereference if the memslot table changes between the exit and the call to kvmppc_e500_shadow_map(). Cc: stable@vger.kernel.org Signed-off-by: Paolo Bonzini --- arch/powerpc/kvm/e500_mmu_host.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/powerpc/kvm/e500_mmu_host.c b/arch/powerpc/kvm/e500_mmu_host.c index e5a145b578a4..732335444d68 100644 --- a/arch/powerpc/kvm/e500_mmu_host.c +++ b/arch/powerpc/kvm/e500_mmu_host.c @@ -349,6 +349,11 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, * pointer through from the first lookup. */ slot = gfn_to_memslot(vcpu_e500->vcpu.kvm, gfn); + if (!slot) { + ret = -EAGAIN; + goto out; + } + hva = gfn_to_hva_memslot(slot, gfn); if (tlbsel == 1) { -- 2.47.1