From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) (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 DB26D374E73 for ; Wed, 20 May 2026 20:49:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779310203; cv=none; b=l9k6djxdpvZSysJntRjeoh9JPB/rHmZGxEFZKC/4g9F6ok5nOkcbe08c+2RapcRmmCd+yz9Xt6fO8X2qyVICuOogfCpbvaW5GdmzHWJmiOxF05+gUpnxsC+ldPZgqlR3Z13xEIaVSNIiDmoVGZz355mw7KG0JHHHwJ1I6s7pY64= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779310203; c=relaxed/simple; bh=tuPvZGzF0btmcEj/P7IKTetF6rM2heeP6hTxQ5GodVw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=IACpOkOzSiofJCp/JGjlqYQebc6MO/YEd1fd/upB5Uy8JlocJNor96nZ35e6OWt/PCaEgoEOYYK9/naRBOjDnIa5tZiAicEOuG/ee835PmEau/x4Fio4u61etBKwLbt5/e845OIQeVLCOFOwG8TqbDdqnY95rcvoT6SjV44gbDM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--smostafa.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=CmFmlDhm; arc=none smtp.client-ip=209.85.128.73 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--smostafa.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="CmFmlDhm" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-48fd64c32e8so35303125e9.3 for ; Wed, 20 May 2026 13:49:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779310198; x=1779914998; 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=Bdxg0o2btss9qMTZzYA98i+uvFmpv+cRF90VMWdHIeA=; b=CmFmlDhm34UNzKt/XDzbrvhdhPyzERzrevA3K2q+3k48HDg+jC202ZRtzjpgqm69Y8 9nPofgd8U+0GabcbSbydAJMKVnOR/kCDiTg8JWnibAltXGAKzhoX2SdrA3LYF+OWPIa3 qcb/klaKBsVyXi4eWGrpxtbchQ7BGqsUqHB0Wbu/B5WvMVAFUHxQL/tHLcQtsSIGaR6L ZyNT4ogUs9sloPhgrvgWR1idQItciYptwHJ4S8vWl9GpYXBTgoG2E3qD3hTXkCYhGTgj +nqUqFv5hz51DZKR9m2k/ngdNsz6JYOBnlpWctzYzsCkZ/67eizy3rXUtyN+HPjfKN4k 2fuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779310198; x=1779914998; 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=Bdxg0o2btss9qMTZzYA98i+uvFmpv+cRF90VMWdHIeA=; b=boLGBASmMdT+wTHW0hgawifR/SvTe4LgCciqyTazOMvWu46v9AFN8FrEwrVmU5BgvS Gel3QpJwuY/d6uXGG8JmZJwRyhW2t3PV6OR+wYyJSDN//kSsjyRGNA2YIc70vZl3x3Zv QjGCob/uutc33nlFnmdBxkL7CvP2/7nCchx9Z2B92i6yeYb+Hd+acIqu4sKFdv4eTT/A KNdmVXJ+RrYRlDdwOj21qqG8HkFq0fUoV9IdXK7ne9HKSkLjd7OIODLrmdfaT4pUNHIh Mv+3qRLwCw4yMrmb07ld+QiqEW2Nlhz/19bkeL96vKst3J5WT+78KXZx+C1LeWu5ryYw +x1A== X-Forwarded-Encrypted: i=1; AFNElJ8cImv+GSt8ZReKlra2gFa/9SKwFjO37FAxdBPpGBiZNDgEvSDCuicsWbleEO6LiJCLXs4aHeDaLBX6NcI=@vger.kernel.org X-Gm-Message-State: AOJu0Yy91aeiWad0SHGQSSmKGWpDKuk3osp6pjQBt5r/pRHzlQT0DS7i a7WOsjlgvH/Bh/8fzNUMhmZxRn5SK+YNgxudhlDM9dSbiXa+/D0ljp7oocpycc9wWA09oke3g1t DGeZiMs2DqINGyA== X-Received: from wmxb16-n1.prod.google.com ([2002:a05:600d:8450:10b0:48f:e53a:e4bf]) (user=smostafa job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:4e53:b0:490:1640:8269 with SMTP id 5b1f17b1804b1-490164089c7mr213656225e9.18.1779310198457; Wed, 20 May 2026 13:49:58 -0700 (PDT) Date: Wed, 20 May 2026 20:49:48 +0000 In-Reply-To: <20260520204948.2440882-1-smostafa@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260520204948.2440882-1-smostafa@google.com> X-Mailer: git-send-email 2.54.0.669.g59709faab0-goog Message-ID: <20260520204948.2440882-6-smostafa@google.com> Subject: [PATCH v4 5/5] KVM: arm64: Validate the offset to the mem access descriptor From: Mostafa Saleh To: op-tee@lists.trustedfirmware.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org Cc: 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, sebastianene@google.com, vdonnefort@google.com, sudeep.holla@kernel.org, Mostafa Saleh Content-Type: text/plain; charset="UTF-8" From: Sebastian Ene Prevent the pKVM hypervisor from making assumptions that the endpoint memory access descriptor (EMAD) comes right after the FF-A memory region header. Prior to FF-A version 1.1 the header of the memory region didn't contain an offset to the endpoint memory access descriptor. The layout of a memory transaction looks like this from 1.1 onward: Type | Field name | Offset [ Header | ffa_mem_region | 0 EMAD 1 | ffa_mem_region_attributes) | ffa_mem_region.ep_mem_offset ] Verify that the offset to the first endpoint memory access descriptor is within the mailbox buffer bounds. [@Mostafa, Add missing call to ffa_rx_release() and use fraglen as the max buffer size as it is the only intialised part] Signed-off-by: Sebastian Ene Signed-off-by: Mostafa Saleh --- arch/arm64/kvm/hyp/nvhe/ffa.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c index e6aa2bfa63b1..38f35887e846 100644 --- a/arch/arm64/kvm/hyp/nvhe/ffa.c +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c @@ -479,7 +479,7 @@ static void __do_ffa_mem_xfer(const u64 func_id, struct ffa_mem_region_attributes *ep_mem_access; struct ffa_composite_mem_region *reg; struct ffa_mem_region *buf; - u32 offset, nr_ranges, checked_offset; + u32 offset, nr_ranges, checked_offset, em_mem_access_off; int ret = 0; if (addr_mbz || npages_mbz || fraglen > len || @@ -508,8 +508,13 @@ static void __do_ffa_mem_xfer(const u64 func_id, buf = hyp_buffers.tx; memcpy(buf, host_buffers.tx, fraglen); - ep_mem_access = (void *)buf + - ffa_mem_desc_offset(buf, 0, hyp_ffa_version); + em_mem_access_off = ffa_mem_desc_offset(buf, 0, hyp_ffa_version); + if (em_mem_access_off + sizeof(struct ffa_mem_region_attributes) > fraglen) { + ret = FFA_RET_INVALID_PARAMETERS; + goto out_unlock; + } + + ep_mem_access = (void *)buf + em_mem_access_off; offset = ep_mem_access->composite_off; if (!offset || buf->ep_count != 1 || buf->sender_id != HOST_FFA_ID) { ret = FFA_RET_INVALID_PARAMETERS; @@ -576,7 +581,7 @@ static void do_ffa_mem_reclaim(struct arm_smccc_1_2_regs *res, DECLARE_REG(u32, flags, ctxt, 3); struct ffa_mem_region_attributes *ep_mem_access; struct ffa_composite_mem_region *reg; - u32 offset, len, fraglen, fragoff; + u32 offset, len, fraglen, fragoff, em_mem_access_off; struct ffa_mem_region *buf; int ret = 0; u64 handle; @@ -599,8 +604,14 @@ static void do_ffa_mem_reclaim(struct arm_smccc_1_2_regs *res, len = res->a1; fraglen = res->a2; - ep_mem_access = (void *)buf + - ffa_mem_desc_offset(buf, 0, hyp_ffa_version); + em_mem_access_off = ffa_mem_desc_offset(buf, 0, hyp_ffa_version); + if (em_mem_access_off + sizeof(struct ffa_mem_region_attributes) > fraglen) { + ret = FFA_RET_INVALID_PARAMETERS; + ffa_rx_release(res); + goto out_unlock; + } + + ep_mem_access = (void *)buf + em_mem_access_off; offset = ep_mem_access->composite_off; /* * We can trust the SPMD to get this right, but let's at least -- 2.54.0.669.g59709faab0-goog