From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (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 865B3282F29 for ; Thu, 18 Jun 2026 16:19:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781799569; cv=none; b=dR2Y/NXMWJSrRvN10+D/BLOFBZ+3d0j9wLl/tDTdrGZHQ3e0pJ+Birh6n3ybXowFsNvHbm1OvJ6/r+vNrrY7LcFrUrzY4Es83JgVseTpodEHd+DHz6nlxT0KwNkTeeKEmmlkqUSM7PpBY25Px/sQya0feyhkTah4fEDKvV+IiGM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781799569; c=relaxed/simple; bh=uzmUSZKJNxpvsYM+nwXF0RdLyej6el26bxG8gdr9KNc=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=n0vPdj5pQIMRTROirQQF/9Dj/WcuWTrSh6Q/QqWdGGUe4dkYKaGIYcyCR339g1ACUoEnEUQNbINjx3XC2SOXEC+PMXZK3hktG+UAmJ+KGgHF1e9NFk+D5zO0+46Xi/tEMKWxjJjJGQI23NDep4Aw4J1MsJ0j2Pr3t1Y+a496HNw= 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=l+HUfhLT; arc=none smtp.client-ip=209.85.221.46 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="l+HUfhLT" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-4645995069bso574718f8f.1 for ; Thu, 18 Jun 2026 09:19:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1781799566; x=1782404366; 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=5MNzaKBiFWGgNDTUfrZ2uI/mAEuS8g827vmh39Qo+Zo=; b=l+HUfhLTJP1NRRyV9s2wjY8bTWkAG0FnlnsNbAVWSzGuCFSFL0icOtsRBNx2unZghD i1aTlNBiDRepGxX0zFEktlhXGoBV1Hp/40gv6iEqjYtINFb/UA11FHFCgEbxICm7fOgq xQdwo8Us9v8Tm2b8ssL6QtBvLO1rQRG2pymUY2cG9Pt5c9iQ/73kNsSZppqd+OLHp8LM f7mmtsMbODSDiROSQaMZTdQ9H84c1uVx9PkuqNX+QlmgA2GFtyUG42Km1QRrHF/0oTSq ZnCMGj4nfjdfDviR6lEwG2fHf2iOdj/SCVvLop8unB5vb0gwCYJPemNLlzybg/qcP+vS uJLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781799566; x=1782404366; 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=5MNzaKBiFWGgNDTUfrZ2uI/mAEuS8g827vmh39Qo+Zo=; b=oa5WHpSCan5HNDg7fU6a/xx/h0a9jYTBOg813N/geNKHJlB7ShoW5eoxh4WSvPaqvm GZsXELa1Nz1gwyQ+2HFke1Gz3YdJBK6VuPatuR8hpWoenjoiqVkbGvHblH70Dih+7Jo0 RUHbBSD3jlgLgRIUrigvtdJzzHaAb1q5/kXLIQphMO5Lg6Ljph34SfQ4uLfDeFa2tUR+ TRiSNqoKDjvecot29oSAVZGA8ml1Pedjpw2osIOuRzFXFgZ+WqJl+AOjPsrUrX6ydl+3 egObvdCr57UT+w783IwzWh/Cnm6f+Es0lTuIUJaMiSMvxw+HnXL5L0kBgTy+UzWPARvg 42lg== X-Forwarded-Encrypted: i=1; AFNElJ+w/1gt1Q60UdC4KS8ENpLowADPl69CxuYJOhlJ/Ziq5YWeh3aoJbLve+oD4fTCzDg4NN+fksQPqtwt3J8=@vger.kernel.org X-Gm-Message-State: AOJu0YwkDpbp5mbUgPf5nujkGtRhKtGCeaSojalsKfQXBcssp6YuLRgg p1KEbHJTiS4y0VDBzO2l6fftsHTJMmJc12+uUwbaCswMJozmVUm8cmqkvzCsi8rQJg== X-Gm-Gg: AfdE7clNKvAY+v7kTpV8rVGEDWKDzplqgRAuf1r1RlNQGKNo50JUXhKNBydRev6z6Hf PgBt3wUmoun6r843670em38RNY+xo0w8O1pOFXGOfWi5+ehXr7CvhDeyWCOK91lFAbc+dpK4e0/ ITZ2fx1VeY99fLitcO0sbAooavlQGsswQgx/Qt6P+ZTcAmjDnEjRLe2HhQP87bVTdj4crnf6eg7 0v/CmCBkZmGYCS/8HcUBhBdaEv9xsNo6K8ORFwbX7KhYGS8Ck0ZFCLpDeeKGtZ3T6gHWKUDqYLH dZE2kfnjC74h6ENLuu3Ji60lI3oL7pKQPWyalSF4HOVUpttOdPAG4wI2ORR5RPTreEXk9F59RLr /yeuVj9uTVTwmTvtIAOhzQVur53ZmOw6yp1kaVz3FWn2KrkBE4m5EB3EHJJFhVXGI6aUhUWDYOU 8zCikmoYIFxpSC2m8VhTPhLy1ypATHnZkYIi3Mmy36310MWqDDZgJbS1my X-Received: by 2002:a05:6000:2384:b0:464:1462:2286 with SMTP id ffacd0b85a97d-4650052fe2amr287936f8f.16.1781799565346; Thu, 18 Jun 2026 09:19:25 -0700 (PDT) Received: from google.com (135.91.155.104.bc.googleusercontent.com. [104.155.91.135]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-46289c3b3a3sm16235705f8f.30.2026.06.18.09.19.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jun 2026 09:19:24 -0700 (PDT) Date: Thu, 18 Jun 2026 17:19:20 +0100 From: Vincent Donnefort To: Sebastian Ene Cc: catalin.marinas@arm.com, oupton@kernel.org, sudeep.holla@kernel.org, will@kernel.org, jens.wiklander@linaro.org, joey.gouly@arm.com, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, android-kvm@google.com, maz@kernel.org, mrigendra.chaubey@gmail.com, op-tee@lists.trustedfirmware.org, perlarsen@google.com, seiden@linux.ibm.com, smostafa@google.com, sumit.garg@kernel.org, suzuki.poulose@arm.com, yuzenghui@huawei.com Subject: Re: [PATCH v7 4/7] KVM: arm64: Fix bounds checking in do_ffa_mem_reclaim() Message-ID: References: <20260617145130.3729015-1-sebastianene@google.com> <20260617145130.3729015-5-sebastianene@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: <20260617145130.3729015-5-sebastianene@google.com> On Wed, Jun 17, 2026 at 02:51:27PM +0000, Sebastian Ene wrote: > From: Mostafa Saleh > > 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 > Signed-off-by: Sebastian Ene FTR, I believe the comment about composite_off in include/linux/arm_ffa.h is incorrect. It is an offset to a ffa_composite_mem_region (not a ffa_mem_region_addr_range) Reviewed-by: Vincent Donnefort > --- > arch/arm64/kvm/hyp/nvhe/ffa.c | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c > index 1af722771178..2d211661952e 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; > @@ -636,11 +636,17 @@ static void do_ffa_mem_reclaim(struct arm_smccc_1_2_regs *res, > ffa_rx_release(res); > } > > + reg = (void *)buf + offset; > + if (offset + CONSTITUENTS_OFFSET(reg->addr_range_cnt) > len) { > + ret = FFA_RET_ABORTED; > + ffa_rx_release(res); > + goto out_unlock; > + } > + > ffa_mem_reclaim(res, handle_lo, handle_hi, flags); > if (res->a0 != FFA_SUCCESS) > goto out_unlock; > > - reg = (void *)buf + offset; > /* 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.1136.gdb2ca164c4-goog >