From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4EFAD4746AB for ; Wed, 2 Sep 2026 18:20:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.199 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788373226; cv=none; b=sYLkzq5WP/5VpvLLmc4eSJo7txS5yFDvA/j1SMwI43OJ2Fsh33UzgedcLDi+LHpPFrVjWRM27UobixJuDsz0tvGJssciun7/JMfKueV18iNjgJAMA/ZY6JryYQ5xdQIXnPYmCbyWxXeIgzREWgPlQv6fQow8vJ2QwATiDtyl7m8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788373226; c=relaxed/simple; bh=4nM44dji28w11w5Jz6G8Fn8/bMsweabqa4o1j27fvSI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=rwpGrBeHQPS+611ptDsYy+l9XwAWvVcDRI57stmrR+9mnm65fwO9OVgejqQZIajBsdEdL5FHesvgXIVdX6wS1aodnbE6Z8fp9PwnV4nx7WCfZt2TF+yXR1qXOQzhBRFdn31qsfZTO3r/isCLxTxiHzvVRp+ImnCG7HB5R5RGduo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=hRLkLrhg; arc=none smtp.client-ip=209.85.210.199 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="hRLkLrhg" Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-85f3a39f3beso1441865b3a.0 for ; Wed, 02 Sep 2026 11:20:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1788373223; x=1788978023; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:reply-to:from:to:cc:subject:date:message-id :reply-to:content-type; bh=Ti7lJbGj6xN91aSen76gggEVAHK8aMIWKvWm2Rqm9Hw=; b=hRLkLrhglCKQLv3hOGl4+ipbDsqfaX/CEDWYiZ0EXyPdNSnxtfSJKs8tTyxBkhGver S4Hja+eTvNTr8Z/dQzj+g9nSQb0Jpw6Pi15pLtzpcaRtsnSJrUcPDvAuZVcCI8WZGPGJ AjTRDchhEn9JOj1jpvlWeaRSRyFJknkK7oSw75hARvVZ8sR4lEVfZLD51SpxPZxeZgXI nbPV1ZiQOXx7Sx05HsBc4yDOO/kGg+LQKTDLU5nqMkRJsYknAUqUCMSp0PkYMpY8IARl U8cyU7C4UA6RiBHU7AIovuWjaXNeERjewrdGe4ZKKzF+L+oDsMX5hapHIj+nKwQNEaeJ w5Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788373223; x=1788978023; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:reply-to:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to:content-type; bh=Ti7lJbGj6xN91aSen76gggEVAHK8aMIWKvWm2Rqm9Hw=; b=qJFO12xKKGPIFQZZu6fs2hJH0SNhF94C2viSd9tGtCw4/5ClVNIVDwTvgT3Ug8hbTc 3AkkTiKjpLm7D0KWUY8NppPfBV/FBW6G0/TLgHribXcEaDSidisadbj7YklSWHOuEF1q VrDtKuivrzIr6ksg/fbCZ/dQ5zKba6BZ8FgnIT7fTvqJop4Fx6pYK7yHiWR0Am3TUi7m Y7lw/NnOxuG4mqE3NhrOt7V9SgaOhceXiOOFanbSQZorM1XpMTC/3UA/6pNkUSmmkMKw VnigMYz+LrvD6udwwtSv27e+7wa72YOdP/0X6uqHeezE7Bs0y8Z0CJGM8ly5q5riZ/pA hcmQ== X-Forwarded-Encrypted: i=1; AKwUvByb2nbpI1JiPDzQinu3ZzOkRoygXJ2QOqnl/brjDaLM7QbpOf7n1dbY9eQVSlfGUMQTVzZHSATOK9LJ0Ks=@vger.kernel.org X-Gm-Message-State: AFuF++md+Y1Tj5lCLy2IYo26x/PZIbHCSU9BSIpeUlxM4iA0W2l3HBCF PZqw72EfnGVYl99ouYCNrXgLoBfvf0HoDPb33+JONeXNE21x5WpFWpa0UyN+niS0X6JsKdQVS6P I98F4qg== X-Received: from pfwp50.prod.google.com ([2002:a05:6a00:26f2:b0:848:2e0e:62e]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:4298:b0:857:3b70:209 with SMTP id d2e1a72fcca58-85ed1d08cb0mr11287585b3a.1.1788373223333; Wed, 02 Sep 2026 11:20:23 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 2 Sep 2026 11:20:17 -0700 In-Reply-To: <20260902182020.2615443-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260902182020.2615443-1-seanjc@google.com> X-Mailer: git-send-email 2.55.0.970.g62bdec98f9-goog Message-ID: <20260902182020.2615443-2-seanjc@google.com> Subject: [PATCH v2 1/4] KVM: guest_memfd: Gracefully handle xarray errors when binding a memslot From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: David Hildenbrand , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Teodorescu , Dennis Tighe , Sashiko Bot , Yan Zhao Content-Type: text/plain; charset="UTF-8" If inserting a memslot into a guest_memfd's bindings xarray fails, propagate the error back to the caller, i.e. fail memslot creation as well. Signalling success and continuing on with memslot creation results in use-after-free, as the guest_memfd instance will remain reachable via the memslot after the file is freed (kvm_gmem_release() won't nullify the file pointer due to lack of a valid binding). Opportunistically WARN and reject binding if KVM_MEMSLOT_GMEM_ONLY is already set, partly to guard against goofs elsewhere, but mostly so that KVM doesn't need to worry about clobbering flags when unwinding on failure. Fixes: a7800aa80ea4 ("KVM: Add KVM_CREATE_GUEST_MEMFD ioctl() for guest-specific backing memory") Cc: stable@vger.kernel.org Reported-by: Stefan Teodorescu Reported-by: Dennis Tighe Reported-by: Sashiko Bot Closes: https://lore.kernel.org/all/20260823135031.4F6DC1F000E9%40smtp.kernel.org Signed-off-by: Sean Christopherson --- virt/kvm/guest_memfd.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c index b596486d184c..2c8d8735de5f 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -612,10 +612,14 @@ int kvm_gmem_bind(struct kvm *kvm, struct kvm_memory_slot *slot, struct inode *inode; struct file *file; int r = -EINVAL; + void *xar; BUILD_BUG_ON(sizeof(gpa_t) != sizeof(offset)); BUILD_BUG_ON(sizeof(gfn_t) != sizeof(slot->gmem.pgoff)); + if (WARN_ON_ONCE(slot->flags & KVM_MEMSLOT_GMEM_ONLY)) + return -EINVAL; + file = fget(fd); if (!file) return -EBADF; @@ -654,7 +658,7 @@ int kvm_gmem_bind(struct kvm *kvm, struct kvm_memory_slot *slot, if (kvm_gmem_supports_mmap(inode)) slot->flags |= KVM_MEMSLOT_GMEM_ONLY; - xa_store_range(&f->bindings, start, end - 1, slot, GFP_KERNEL); + xar = xa_store_range(&f->bindings, start, end - 1, slot, GFP_KERNEL); filemap_invalidate_unlock(inode->i_mapping); /* @@ -662,7 +666,13 @@ int kvm_gmem_bind(struct kvm *kvm, struct kvm_memory_slot *slot, * not the other way 'round. Active bindings are invalidated if the * file is closed before memslots are destroyed. */ - r = 0; + r = xa_is_err(xar) ? xa_err(xar) : 0; + if (r) { + xa_store_range(&f->bindings, start, end - 1, NULL, GFP_KERNEL); + slot->gmem.file = NULL; + slot->gmem.pgoff = 0; + slot->flags &= ~KVM_MEMSLOT_GMEM_ONLY; + } err: fput(file); return r; -- 2.55.0.970.g62bdec98f9-goog