From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 7142636A009 for ; Fri, 12 Jun 2026 14:22:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781274153; cv=none; b=d8y2ekDcHkj4HCjYdHXNyd9Sp1fHHQ42v45dXARGrQoq8L4uBEaG5hp/oktJG6uTZTC0XVraTKkDvo7hFhHn4aXO4Wbhpq/LUxtztimVBVP6vvD30v+O10oYQjn0sKeAOKMz/ZIcMeoIC0AHSIRgNIAzPHtRcNpgMG897qZRUE0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781274153; c=relaxed/simple; bh=zHwPddHtZ+nAl0/u5z9/ESyAgx0+d2S2sHjzyMdqxQY=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=fGmJ+XnVIYoFstd6DQOI2ehKlONBPiIuJxdFIxKUC7iRuzy9y74wPoFSNbeBjDsPv53PhXXVMNF2Lb5H2u9Om2PuP60hkUk1or1/hHrRZXM8fU+64f5zMh37CVZCCGgk8nRJsispYwxhn6vJ4NXRm9BUfu08u4D2Aic93zskpL0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=bpAVFbz5; arc=none smtp.client-ip=209.85.128.51 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=google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="bpAVFbz5" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-490bd64ca95so70685e9.0 for ; Fri, 12 Jun 2026 07:22:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1781274151; x=1781878951; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=U0u5FTqBTXNLLGdidnrnWIaCMVX09cl5M57gIDTlUfs=; b=bpAVFbz5bp13+3+ALs4Ab5NGU098DN0Zxu/ZFoIxm1YgNGVIUyimU5yda9vHS8cFiX 4yyOfSJAcF/uUvN2YFPsrfSP925TKZYj3sO3Z8Ek2xTqglmKDxUNxpU7roLZ8lEGF3f6 2+HRi/W5OgB4hXggIYS1JNP6npHOLZqImYnKkur1tW6Mw6ZSaNMTcTqqdZoQQamQyZ7G y6oLBzek3lOgLY4/HT8dXINMNWofxk+YRih0AXsqTqZagXBbqK5lg8p08o7jrIFJfwoF wDIGX/UmLLwAKAHXBSa3bPG6QrcavCCeE49eIRSsuNtaUy2HjEnxce16tbG6trMsAx9U T5Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781274151; x=1781878951; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=U0u5FTqBTXNLLGdidnrnWIaCMVX09cl5M57gIDTlUfs=; b=Ps0UVuoJfGV9TX7/y5B8R6Ewqbb9uSvc6T4qU6EHtZK9Yc9E7wqA5s8KAENEkaCJ2s cxvARWJVNcv4FLT89oY46bTUMHPUzh0M1OSHhhjHwiTR3b/ZnJ4NiTdBPUynT1Zr7N1/ e+8m/bv2s227YWOXsIbwHSS/nMxmu8DdpTdJls1xo5mYWpRbgwlxc20zWOyewAf6dOMu Og+UCUlU6W4IMYbNc0Xc3H9nxlFR2SIfjfafayWINxh91lWsS4AP7KLhSkf3bBVbkmcO 6zgF/KzeuFm1KYjZqEEm3rRdwnWki6m23a7OxVSB1GHKIFmPMrknOy4aWJ+B+6GGKjdE 7jBw== X-Forwarded-Encrypted: i=1; AFNElJ/uV2KCSksTOQAkHDslu4wnBi9nunUyEP3tvy+IW50o3fMcubKLnKIu/g0SIh62mtJ5C/VAPWyCfkUuC8w=@vger.kernel.org X-Gm-Message-State: AOJu0Ywp+IzXa9yxZ4qgGMXN3lWcyWCQ8OIZd7oZa4GYwHHcD7JTYYf1 vLXVJvs6CuT9tIdZgU5oVxCz5//cQ8iE5HOi5ixUnWraYkOQSZWolMMsKq/RlBE5tA== X-Gm-Gg: Acq92OGc6Jt5x06P7vmInaa3+Q/f86ZvriB1MpMsYH00HHQ+Ou4+3c8ryO3bYMsaQiD oh/4I1aStxXX+4DsPKTnP5nwdUsVZNOP2k/tqV+roIh3icgOydoGXLTbJFekxmLex+gJQGvSWcH rU64EZ+tkHAEkGiEtUnRtoAYL8am/ejyvv6rNS7YHYgDYctnmt4x2nOTfDHoCVwxpVS/smRWg5u btUz1BERlzDYuQ81pcGdpvEcMJnNHxmveXmfahnG6pD177m23uSgInzArndFoA++kcwdU+Z6U9h YlOETDxWQLqzd6tPszbarF2V8xT0kYw7c045Nk0eXWpxqvBh8YjKBBh9AST1OZtotMJ3UT3kj/F 6qNgE1b4dFPZUgscAbDb8gjCkZwodyw96U+PdOTNBVObiSSBg94kb2GDlpOWUlu/u/P0Kof0ser GuB9G9PpAlSS3HW+k4nYbeRsmm5u0y8iTyTwB7md0CJsMp73utivFV1e/LMLZPEyB9Nt7Ofg== X-Received: by 2002:a05:600c:6b62:b0:485:1a54:9407 with SMTP id 5b1f17b1804b1-490ea5204ffmr1201925e9.0.1781274150414; Fri, 12 Jun 2026 07:22:30 -0700 (PDT) Received: from google.com (143.11.148.146.bc.googleusercontent.com. [146.148.11.143]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-490ea7db9c6sm71157125e9.8.2026.06.12.07.22.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2026 07:22:29 -0700 (PDT) Date: Fri, 12 Jun 2026 14:22:25 +0000 From: Sebastian Ene To: Mostafa Saleh Cc: op-tee@lists.trustedfirmware.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, maz@kernel.org, oupton@kernel.org, joey.gouly@arm.com, suzuki.poulose@arm.com, catalin.marinas@arm.com, jens.wiklander@linaro.org, sumit.garg@kernel.org, vdonnefort@google.com, sudeep.holla@kernel.org Subject: Re: [PATCH v6 4/6] KVM: arm64: Fix bounds checking in do_ffa_mem_reclaim() Message-ID: References: <20260527150236.1978655-1-smostafa@google.com> <20260527150236.1978655-5-smostafa@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260527150236.1978655-5-smostafa@google.com> On Wed, May 27, 2026 at 03:02:34PM +0000, Mostafa Saleh wrote: > Sashiko (locally) reports out of bound write possiblity if SPMD > returns an invalid data. > > While SPMD is considered trusted, pKVM does some basic checks, > for offset to be less than or equal len. > > However, that is incorrect as even if the offset is smaller than > len pKVM can still access out of bound memory in the next > ffa_host_unshare_ranges(). > > Split this check into 2: > 1- Check that the fixed portion of the descriptor fits. > 2- After getting reg, check the variable array size addr_range_cnt > fits. > > Also, drop the WARN_ONs as that will panic the kernel and in the > next checks there are no WARNs, so that makes it consistent. > > Fixes: 0a9f15fd5674 ("KVM: arm64: pkvm: Add support for fragmented FF-A descriptors") > Signed-off-by: Mostafa Saleh > --- > arch/arm64/kvm/hyp/nvhe/ffa.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c > index 1af722771178..b6cf9ad82e12 100644 > --- a/arch/arm64/kvm/hyp/nvhe/ffa.c > +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c > @@ -607,8 +607,8 @@ static void do_ffa_mem_reclaim(struct arm_smccc_1_2_regs *res, > * check that we end up with something that doesn't look _completely_ > * bogus. > */ > - if (WARN_ON(offset > len || > - fraglen > KVM_FFA_MBOX_NR_PAGES * PAGE_SIZE)) { > + if (offset + CONSTITUENTS_OFFSET(0) > len || > + fraglen > KVM_FFA_MBOX_NR_PAGES * PAGE_SIZE) { > ret = FFA_RET_ABORTED; > ffa_rx_release(res); > goto out_unlock; > @@ -641,6 +641,11 @@ static void do_ffa_mem_reclaim(struct arm_smccc_1_2_regs *res, > goto out_unlock; > > reg = (void *)buf + offset; > + if (offset + CONSTITUENTS_OFFSET(reg->addr_range_cnt) > len) { > + ret = FFA_RET_ABORTED; > + goto out_unlock; > + } > + I wonder if we should do this check first and then mem_reclaim, the rational being that if the check fails the page will be lost forever. ``` reg = (void *)buf + offset; if (offset + CONSTITUENTS_OFFSET(reg->addr_range_cnt) > len) { ret = FFA_RET_ABORTED; goto out_unlock; } ffa_mem_reclaim(res, handle_lo, handle_hi, flags); if (res->a0 != FFA_SUCCESS) goto out_unlock; ``` > /* If the SPMD was happy, then we should be too. */ > WARN_ON(ffa_host_unshare_ranges(reg->constituents, > reg->addr_range_cnt)); > -- > 2.54.0.746.g67dd491aae-goog > Sebastian