From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (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 F15082C11E4 for ; Wed, 1 Jul 2026 21:22:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782940960; cv=none; b=kLnq+qOJP5PBOE5vDCYFH+j08W+R05tFmNGgs2OjZ/AO1G8OClFkFc8Mz1mUAqBoXZdPzAGgKhyOkorE++hmxaLTwPZf/Cf7p7aTGh5wr8dViHN/jxZvn1ybMuTDU5cDm80fCchv8p1pKb4p5Y3sFL0XihJPDhFkzUhYNE2kpP4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782940960; c=relaxed/simple; bh=kip77Md7PwYITJnOOQMo7p3iswnskWypncJ5FdSTB1Y=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=nBj2KAORocpv8Q3DFWazSf8qSCKvs8AzyZmgREVUtgLsnsBjxpgpB/NnTyd0sj71RE5v1c++Pz8c0lTyghfyCFhI6Dj/naBxul23dm5w7H2bYNe4gWo0miXq5iygKfjZV6RkBpWIC8/pTcjN9elX3eWFoOTdErfsjJhYdV7MTGY= 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=YXjlBlDx; arc=none smtp.client-ip=209.85.214.201 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="YXjlBlDx" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2c8018f11fbso13784885ad.3 for ; Wed, 01 Jul 2026 14:22:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782940958; x=1783545758; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=haHjTZYd6eldytH5GfA3G4FAjy8Nb18IhisBBKGE6LY=; b=YXjlBlDxGGZQ/U7bzPwwwBm5Wvs+yo4JStpltpYrIpLC0ip0KtY2df9KaCxWxROxtp umbHlteeMARpvMf21AYmuBS+gWVni2GZITK4KZ6kjegA3XkEOIom9vHCA9kPVnPhTg0G 1tt11P4k0l/xBdIqc/twiV0Ha6slfLfMlRIuBEGFgL1GlEBJ9zepdMdSyPK7jl4QXva8 lBzPM0Joyx+52YWdWuTcOCv3ceC2cOqKwk3ADZJJIFHU5AUeK4odMM7nLr/Kgvgno2rD 8afR4MGhTJgLZD54+wcCl8L+xN/HPp/yy67o+IgDbCKPSnZZjF8KhelpnKgNMH4lvRiz ZX2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782940958; x=1783545758; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=haHjTZYd6eldytH5GfA3G4FAjy8Nb18IhisBBKGE6LY=; b=DiYl84rr2qgxib9l4tYgY54xVUSjQBsLJeDkwj1aQihhZgpXcjdF/Pelp/Vdtd/7e8 5i8x5nWhnExxPdY9OXSGZiQbJSOIE0VJ1jEF8D0ONUItFMTFewJa9dm8nuRgneDCI7Vh OOcLJ9j9W2vPrZMNUtYIq9J4ayJ7cbItWBnqeBYWNJ+QnUsweZfdNMxJgG8cK4J+FT9i TdMvUA//B6FvZxKGcELTgbOkbPWLMHWKID8N3TDz3m3xlvKOx2l86AdwCVDASJR8XYzC JKwFhB9d8NjXGqip6tpQlfmx/zDRriTqudtjQugqekEUTz2A8FAanU32qIs1TTTEYOdb v4Kg== X-Forwarded-Encrypted: i=1; AHgh+RpH7wgpvrdg0xoAhKtaGBw15GF0pfqyNPgWbp3swp2hi8R4g/d/zNWw0OXCwNYnLx+nj4OvqS+NcQM5C4U=@vger.kernel.org X-Gm-Message-State: AOJu0YyD3GYcYwPhe5rJo4RzDDcdhToXwdwrSolalbzHUPsA1zB6DVG7 PRr4N+I3mcDo99Atq0vAphWGhI4+72RRvjHl56RnmKY421cisMkSUvj9slVj/hjTwufbwGCAf1D r71be6g== X-Received: from plnx15.prod.google.com ([2002:a17:902:820f:b0:2c9:9db6:88e]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:2ec6:b0:2c9:e846:a57e with SMTP id d9443c01a7336-2ca90c2d830mr24586315ad.0.1782940958029; Wed, 01 Jul 2026 14:22:38 -0700 (PDT) Date: Wed, 1 Jul 2026 14:22:37 -0700 In-Reply-To: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260630213711.479692-1-seanjc@google.com> <20260630213711.479692-2-seanjc@google.com> Message-ID: Subject: Re: [PATCH v2 1/2] KVM: SEV: Explicitly disallow NULL user address for SNP_LAUNCH_UPDATE From: Sean Christopherson To: Ackerley Tng Cc: Paolo Bonzini , Kiryl Shutsemau , Dave Hansen , Rick Edgecombe , kvm@vger.kernel.org, x86@kernel.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, Sashiko Bot , Joerg Roedel , Yan Zhao Content-Type: text/plain; charset="us-ascii" On Wed, Jul 01, 2026, Ackerley Tng wrote: > Sean Christopherson writes: > > diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c > > index 74fb15551e83..621a2eaa58f2 100644 > > --- a/arch/x86/kvm/svm/sev.c > > +++ b/arch/x86/kvm/svm/sev.c > > @@ -2330,9 +2330,6 @@ static int sev_gmem_post_populate(struct kvm *kvm, gfn_t gfn, kvm_pfn_t pfn, > > int level; > > int ret; > > > > - if (WARN_ON_ONCE(sev_populate_args->type != KVM_SEV_SNP_PAGE_TYPE_ZERO && !src_page)) > > - return -EINVAL; > > - > > ret = snp_lookup_rmpentry((u64)pfn, &assigned, &level); > > if (ret || assigned) { > > pr_debug("%s: Failed to ensure GFN 0x%llx RMP entry is initial shared state, ret: %d assigned: %d\n", > > @@ -2421,10 +2418,12 @@ static int snp_launch_update(struct kvm *kvm, struct kvm_sev_cmd *argp) > > params.type != KVM_SEV_SNP_PAGE_TYPE_CPUID)) > > return -EINVAL; > > > > - src = params.type == KVM_SEV_SNP_PAGE_TYPE_ZERO ? NULL : u64_to_user_ptr(params.uaddr); > > - > > - if (!PAGE_ALIGNED(src)) > > + if (params.type == KVM_SEV_SNP_PAGE_TYPE_ZERO) > > + src = NULL; > > + else if (!params.uaddr || !PAGE_ALIGNED(params.uaddr)) > > return -EINVAL; > > + else > > + src = u64_to_user_ptr(params.uaddr); > > > > I think separating validation from src assignment logic is better, like > > if (!PAGE_ALIGNED(params.uaddr)) > return -EINVAL; > > if (!params.uaddr && params.type != KVM_SEV_SNP_PAGE_TYPE_ZERO) > return -EINVAL; > > src = params.type == KVM_SEV_SNP_PAGE_TYPE_ZERO ? NULL : > u64_to_user_ptr(params.uaddr); > > This version is also slightly stricter, since it enforces that > params.uaddr is aligned even if params.type is ZERO. That's technically an ABI change since KVM fully ignored params.uaddr before this, i.e. is a potentially breaking change. As noted in the changelog, KVM should have required the address to be '0', but unfortunately we can't do that without breaking userspace. I highly doubt requiring the address to be page-aligned would break userspace, but KVM also gains nothing from such a requirement, and from an ABI perspective, placing restrictions on a value that is completely ignored is rather bizarre. > (unless the intention is to really not care about uaddr and permit an > unaligned uaddr?) I don't think there was any intention (which is the whole problem).