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 ED2303EFD3B for ; Tue, 30 Jun 2026 10:21:28 +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=1782814890; cv=none; b=IHzc8b5GMbcyX1iEc1xBWAlkvmpib0huHRc9VsYC5dVwbEmNA98psESYwhvWfX9G3dGFNyfJeyhhNrmG57m+clCP53lv6YRaedZBX29QBHlH9CoqFY1CkNjiigJ6IAH+qHqjuebrZQGGsWl8YwfdqD5WN0U9z4LDSYFLflx1YKg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782814890; c=relaxed/simple; bh=gSAanya4JdlbcJVPzlLFyt71ySjRkBo8hJyqogn8+Oo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=kNfEAQzM2HRHC8W5dfwkEqmdRocRI/mbO5kLsKehsSMrXibHEGw1DlrpmVc8+tSXzp4a6UsO5kMS/QmKo0tRWiOWLvwXOJvwxScUQg0fsP7JEBIYzNoUf8QhbJaPxpM1zy3g3cE28K+R5CXeZ6u09xVUsUjb7XZLFz4l1IHuaGI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--sebastianene.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=QdoxKec3; 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--sebastianene.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="QdoxKec3" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-493b21b1fe8so12802475e9.0 for ; Tue, 30 Jun 2026 03:21:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782814887; x=1783419687; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=S2U/VeegX6zkq+FfETCymx32V7rN5pCpIXqjl6Jjj74=; b=QdoxKec32LRDQjl7+hwV0PuCewfDMmj/V3fGrqy6B/u3FpVG3IxCKgPN3kl+M333Nb Kh81feItt6GxN9QLp3ux5ubABZdUvYgfwPkVR7Kk0+J8UEadec1VZRuvPVRZxdXmNK2X ISKjwd9D/cXEgL9L7wP6YJqNiFGNtsmqP0NprOsdKpBcegDAbZb0Aassacmd6EHRog/C t3Fm9Wz77TrMw2DcDXyaiLHZ3kKQpO1rwORiY6BEoyDUySjeO3clPdX4RAk5tbRVYN86 6pE0oorLkOGKeqoR9FPjdvnvI9wQ6cWCdm/1ZQfWhht/b9fTE6tgHd7w39A/TncG+I6i HwRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782814887; x=1783419687; h=content-type: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:content-type; bh=S2U/VeegX6zkq+FfETCymx32V7rN5pCpIXqjl6Jjj74=; b=UggdRR3V+k4OdsgbS9S4K1tGERqh+eFetqMp9bvrXH4PLbSWK48XCCiqKLLu1CSSLK cuNXZ1BJjciMcaiarkPY3a7M5ybbYUVYrBsNWLRy1cHUnAN9K7jN01cCSBbECs8gOD2u vLgH9wG6li0y3esIHYw+Wjzbfg4lz5fqJ5Z6IpYLUqsna1ZVvXjjOkA7F0NN2gLG4/wo aogo2LYXrdZHnxsB98Q8Bh2CXEKe4KOXlnYXCxcv7LsEyylNXpPG7B9XJArcCaPh9l3Y 5iMttojwuJg9V5Ybh3rAdv8EcC8PYNiz9gUWZalj2iCVun7NSMa0kwsq1Fkwy2e2eoDk Bpsg== X-Forwarded-Encrypted: i=1; AFNElJ8IjJg1xAdvu6vEJaUY4nMrCXfGDFVW/8QxdU7lp8S+23akb1J/1Z+h6em914LSEEY45Bm+ybnjGeAA2t0=@vger.kernel.org X-Gm-Message-State: AOJu0YzaRWA7ioxeikBuhm4Y3asYiJpACSAqT5BT/h/E9mVbWe+IaIXW U6WO8OM6r4HZtvHDD3UwE5ZgrhqRd2E+nVMpb5QqiuZXEZTrdXEwV1qy9V9ZT0JEZaihB+eTV1F v9Mkq1tuoeMelG6pj44sQ+jrZDGnnBA== X-Received: from wmrc3.prod.google.com ([2002:a05:600c:ac3:b0:492:4e77:8950]) (user=sebastianene job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:b96:b0:490:acb8:1490 with SMTP id 5b1f17b1804b1-493b827fd1emr41693135e9.4.1782814887055; Tue, 30 Jun 2026 03:21:27 -0700 (PDT) Date: Tue, 30 Jun 2026 10:20:57 +0000 In-Reply-To: <20260630102058.3219867-2-sebastianene@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260630102058.3219867-2-sebastianene@google.com> X-Mailer: git-send-email 2.55.0.rc0.799.gd6f94ed593-goog Message-ID: <20260630102058.3219867-6-sebastianene@google.com> Subject: [PATCH v8 4/6] KVM: arm64: Validate the offset to the mem access descriptor From: Sebastian Ene To: catalin.marinas@arm.com, oupton@kernel.org, sudeep.holla@kernel.org, will@kernel.org Cc: 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, sebastianene@google.com, seiden@linux.ibm.com, smostafa@google.com, sumit.garg@kernel.org, suzuki.poulose@arm.com, vdonnefort@google.com, yuzenghui@huawei.com Content-Type: text/plain; charset="UTF-8" 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. Also, fix one hardcoded sizeof(struct ffa_mem_region_attributes) that should be replaced ffa_emad_size_get() for compatibility with FFA v1.0. Fixes: 42fb33dde42b ("KVM: arm64: Use FF-A 1.1 with pKVM") Signed-off-by: Mostafa Saleh Signed-off-by: Sebastian Ene --- arch/arm64/kvm/hyp/nvhe/ffa.c | 27 +++++++++++++++++++-------- include/linux/arm_ffa.h | 7 +++++++ 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c index 2d211661952e..14aa37846059 100644 --- a/arch/arm64/kvm/hyp/nvhe/ffa.c +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c @@ -476,11 +476,12 @@ static void __do_ffa_mem_xfer(const u64 func_id, DECLARE_REG(u32, fraglen, ctxt, 2); DECLARE_REG(u64, addr_mbz, ctxt, 3); DECLARE_REG(u32, npages_mbz, ctxt, 4); + u32 offset, nr_ranges, checked_offset, em_mem_access_off; 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; int ret = 0; + size_t mem_region_len = FFA_MEM_REGION_SZ(hyp_ffa_version); if (addr_mbz || npages_mbz || fraglen > len || fraglen > KVM_FFA_MBOX_NR_PAGES * PAGE_SIZE) { @@ -488,8 +489,7 @@ static void __do_ffa_mem_xfer(const u64 func_id, goto out; } - if (fraglen < sizeof(struct ffa_mem_region) + - sizeof(struct ffa_mem_region_attributes)) { + if (fraglen < mem_region_len + ffa_emad_size_get(hyp_ffa_version)) { ret = FFA_RET_INVALID_PARAMETERS; goto out; } @@ -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 ((u64)em_mem_access_off + ffa_emad_size_get(hyp_ffa_version) > 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; @@ -574,9 +579,9 @@ static void do_ffa_mem_reclaim(struct arm_smccc_1_2_regs *res, DECLARE_REG(u32, handle_lo, ctxt, 1); DECLARE_REG(u32, handle_hi, ctxt, 2); DECLARE_REG(u32, flags, ctxt, 3); + u32 offset, len, fraglen, fragoff, em_mem_access_off; struct ffa_mem_region_attributes *ep_mem_access; struct ffa_composite_mem_region *reg; - u32 offset, len, fraglen, fragoff; 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 ((u64)em_mem_access_off + ffa_emad_size_get(hyp_ffa_version) > 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 diff --git a/include/linux/arm_ffa.h b/include/linux/arm_ffa.h index 033c630b271b..e71d83ee0aef 100644 --- a/include/linux/arm_ffa.h +++ b/include/linux/arm_ffa.h @@ -421,6 +421,13 @@ struct ffa_mem_region { #define FFA_EMAD_HAS_IMPDEF_FIELD(version) ((version) >= FFA_VERSION_1_2) #define FFA_MEM_REGION_HAS_EP_MEM_OFFSET(version) ((version) > FFA_VERSION_1_0) +/* The layout changed from FFA_VERSION_1_0 and the region includes an + * ep_mem_offset. + */ +#define FFA_MEM_REGION_SZ(version) (!FFA_MEM_REGION_HAS_EP_MEM_OFFSET((version)) ?\ + offsetof(struct ffa_mem_region, ep_mem_offset) :\ + sizeof(struct ffa_mem_region)) + static inline u32 ffa_emad_size_get(u32 ffa_version) { u32 sz; -- 2.55.0.rc0.799.gd6f94ed593-goog