public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
From: Claudio Imbrenda <imbrenda@linux.ibm.com>
To: linux-kernel@vger.kernel.org
Cc: kvm@vger.kernel.org, linux-s390@vger.kernel.org,
	borntraeger@de.ibm.com, frankja@linux.ibm.com, nrb@linux.ibm.com,
	seiden@linux.ibm.com, schlameuss@linux.ibm.com,
	gra@linux.ibm.com, david@kernel.org
Subject: [PATCH v3 6/6] KVM: s390: ucontrol: Fix memslot handling
Date: Thu,  2 Apr 2026 17:01:35 +0200	[thread overview]
Message-ID: <20260402150135.196943-7-imbrenda@linux.ibm.com> (raw)
In-Reply-To: <20260402150135.196943-1-imbrenda@linux.ibm.com>

Fix memslots handling for UCONTROL guests. Attempts to delete user
memslots will fail, as they should, without the risk of a NULL pointer
dereference.

Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
---
 arch/s390/kvm/kvm-s390.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index be2a721e2574..435c3a1b74f8 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -5636,7 +5636,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm,
 				   struct kvm_memory_slot *new,
 				   enum kvm_mr_change change)
 {
-	if (kvm_is_ucontrol(kvm) && new->id < KVM_USER_MEM_SLOTS)
+	if (kvm_is_ucontrol(kvm) && new && new->id < KVM_USER_MEM_SLOTS)
 		return -EINVAL;
 
 	/* When we are protected, we should not change the memory slots */
-- 
2.53.0


  parent reply	other threads:[~2026-04-02 15:01 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-04-02 15:01 [PATCH v3 0/6] KVM: s390: Enable 4k granularity for memslots Claudio Imbrenda
2026-04-02 15:01 ` [PATCH v3 1/6] KVM: s390: Add some useful mask macros Claudio Imbrenda
2026-04-07 12:13   ` Steffen Eiden
2026-04-09 13:41   ` Christoph Schlameuss
2026-04-02 15:01 ` [PATCH v3 2/6] KVM: s390: Add alignment checks for hugepages Claudio Imbrenda
2026-04-07 12:30   ` Steffen Eiden
2026-04-10  9:15   ` Christoph Schlameuss
2026-04-02 15:01 ` [PATCH v3 3/6] KVM: s390: Allow 4k granularity for memslots Claudio Imbrenda
2026-04-07 12:33   ` Steffen Eiden
2026-04-10 10:02   ` Christoph Schlameuss
2026-04-02 15:01 ` [PATCH v3 4/6] KVM: selftests: Remove 1M alignment requirement for s390 Claudio Imbrenda
2026-04-07 12:44   ` Steffen Eiden
2026-04-10 11:28   ` Christoph Schlameuss
2026-04-02 15:01 ` [PATCH v3 5/6] KVM: s390: selftests: enable some common memory-related tests Claudio Imbrenda
2026-04-07 12:47   ` Steffen Eiden
2026-04-07 13:04     ` Claudio Imbrenda
2026-04-07 13:41       ` Steffen Eiden
2026-04-07 15:19   ` Steffen Eiden
2026-04-09  8:50   ` Claudio Imbrenda
2026-04-10 12:02   ` Christoph Schlameuss
2026-04-02 15:01 ` Claudio Imbrenda [this message]
2026-04-07 12:55   ` [PATCH v3 6/6] KVM: s390: ucontrol: Fix memslot handling Steffen Eiden
2026-04-07 13:05     ` Claudio Imbrenda
2026-04-10  9:25   ` Christoph Schlameuss

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260402150135.196943-7-imbrenda@linux.ibm.com \
    --to=imbrenda@linux.ibm.com \
    --cc=borntraeger@de.ibm.com \
    --cc=david@kernel.org \
    --cc=frankja@linux.ibm.com \
    --cc=gra@linux.ibm.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=nrb@linux.ibm.com \
    --cc=schlameuss@linux.ibm.com \
    --cc=seiden@linux.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox