From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.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 01A693939C2 for ; Thu, 2 Jul 2026 10:39:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782988747; cv=none; b=uPWt5d5XcSHaRWJd1sxAMAh4ExL9565tHucJSAd+WJDnRkiwqA4RWq1r4pnFSRZjWoAmV8EA/ssyWA6dmWqxgoUic6JYUPd1ij4jkXsKa+jVDFZ3tmNTUOi54smMIYAFAELkdbgyLGwXQh6OBkJwwynEgH+rqBDYLuWFXkNt5Ik= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782988747; c=relaxed/simple; bh=9TOnq1jD0pgHaO1v5HJoXAFTZmNdtts5+PujmRUbv1g=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=PCueKJyiCH/his3KfH0TP3SNOisYOF+9xr3agFmlHpbegqxeSYN4/axkMXVNFe2gpr8uRRcQc4Ho5dAJTANrt6t3fzNoNqYw7rT8neRkbVFXisakkX559gsBeEcboNceesouWV5tUzYsFfa64Vsk0M/Xu7O4fqxHi83CHGOOboU= 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=JcG7BSwB; arc=none smtp.client-ip=209.85.221.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="JcG7BSwB" Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-473f4a48e9aso1057320f8f.2 for ; Thu, 02 Jul 2026 03:39:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782988744; x=1783593544; 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=kMc7IH1jEIo7aTQO6+OKWeTUOGgdg0YUEMVyYCucVMQ=; b=JcG7BSwBFHkmxiW3HmuI0/b1fBJSLXZowGQvyOURAFXLrs9Yz4zHcBV5vqGa6rC3lP PuaWPtSk0dvwP7d4Gx08cv9FZ5NIXbukS5XgeQG9VID15gaZodGKdO93gPy+RVKwleRI UP/Rzn4qm7xnAoFgp6eNTCg4b5bpwodGs85CfxId/YTI4tRWt4bj1OBG8OQwvg5Pqg8W nEhrARvRHCuCbuLjbgDmM0SaKJhl+gQRNhJQ6dh7GerkQp3TWtXrHgkos0XOH07Uvlzs EDuof5lzxLEEZcPqVhcaTUoAFYc1/wDL+SZhSJbL/HJoGgLGMorItLhxBO9NtxortZQq vfXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782988744; x=1783593544; 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=kMc7IH1jEIo7aTQO6+OKWeTUOGgdg0YUEMVyYCucVMQ=; b=mb896Uc7zRe2jqQ4BI+52+MtcJ406KPI749Zfz5uYWU+RGXlhKv13eUW4isWZnsGSY YeflF9ZxQJ9vr6YA0acBiOp4HdYahByijTgpor7rhgbS+P6mKtYufNofPk1P8FLLxwyw /y4HihHfBafgipZQO6yKUUVSvnTLAkQMQ9oqDUnNiPLNCr+5B3vgxcNBTPVWlQdbRali TBdrUpriQVwlDOaT/hReWE8afOV61MCwGuprPu/dcrH+ShYYDRdXCSa3agSTKMJaNOVY MzYSv7D5PxFyabiX4ut+d1HsUYwo2bCW9XayWgycCzzlcSykcjzUkNUW+hlfcWAc2GXB 2iQw== X-Forwarded-Encrypted: i=1; AFNElJ8J/xNJXBkOipxr6AW18tq18xSv7q1vWhgJbsSuN+LYRBj6E1MEecI/RBXUF2Wsi0oVf/xx8Em+eKR+6nk=@vger.kernel.org X-Gm-Message-State: AOJu0Yx9C5nOW55ruqrC5qlps5qG+9nLR0BIELpjK2ABjlYIFQnBKEDr roGl6a7F3FOTVx/HaX0idbQOmfpRv4Y+UUC/Xr7FYreEF+2kvFLFs9quBM0OHk0+hPQrNBXHgnm 62nfQeRwZDOC0QQGQVfnGUqB3h3e/qw== X-Received: from wmbf13.prod.google.com ([2002:a05:600c:594d:b0:493:b636:4ee9]) (user=sebastianene job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:5010:b0:493:c453:600f with SMTP id 5b1f17b1804b1-493c453616emr44043235e9.6.1782988744277; Thu, 02 Jul 2026 03:39:04 -0700 (PDT) Date: Thu, 2 Jul 2026 10:38:39 +0000 In-Reply-To: <20260702103848.1647249-1-sebastianene@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260702103848.1647249-1-sebastianene@google.com> X-Mailer: git-send-email 2.55.0.rc0.799.gd6f94ed593-goog Message-ID: <20260702103848.1647249-3-sebastianene@google.com> Subject: [PATCH v9 2/6] firmware: arm_ffa: Fix Endpoint Memory Access Descriptor offset calculation 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" Use the descriptor's `ep_mem_offset` to calculate the start of the endpoint memory access array and to comply with the FF-A spec instead of defaulting to `sizeof(struct ffa_mem_region)`. This requires moving `ffa_mem_region_additional_setup()` earlier in the setup flow. Also, add sanity checks to ensure the calculated descriptor offsets do not exceed `max_fragsize`. Fixes: 113580530ee7 ("firmware: arm_ffa: Update memory descriptor to support v1.1 format") Reviewed-by: Sudeep Holla Signed-off-by: Mostafa Saleh Signed-off-by: Sebastian Ene --- drivers/firmware/arm_ffa/driver.c | 20 +++++++++++++++----- include/linux/arm_ffa.h | 2 +- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/drivers/firmware/arm_ffa/driver.c b/drivers/firmware/arm_ffa/driver.c index 01301213896a..7c1b747797b4 100644 --- a/drivers/firmware/arm_ffa/driver.c +++ b/drivers/firmware/arm_ffa/driver.c @@ -713,19 +713,30 @@ ffa_setup_and_transmit(u32 func_id, void *buffer, u32 max_fragsize, struct ffa_composite_mem_region *composite; struct ffa_mem_region_addr_range *constituents; struct ffa_mem_region_attributes *ep_mem_access; - u32 idx, frag_len, length, buf_sz = 0, num_entries = sg_nents(args->sg); + u32 idx, frag_len, length, buf_sz = 0, num_entries = sg_nents(args->sg), ep_offset; + u32 emad_end, emad_size = ffa_emad_size_get(drv_info->version); mem_region->tag = args->tag; mem_region->flags = args->flags; mem_region->sender_id = drv_info->vm_id; mem_region->attributes = ffa_memory_attributes_get(func_id); + + ffa_mem_region_additional_setup(drv_info->version, mem_region); composite_offset = ffa_mem_desc_offset(buffer, args->nattrs, drv_info->version); + if (composite_offset + sizeof(*composite) > max_fragsize) + return -ENXIO; for (idx = 0; idx < args->nattrs; idx++) { - ep_mem_access = buffer + - ffa_mem_desc_offset(buffer, idx, drv_info->version); - memset(ep_mem_access, 0, ffa_emad_size_get(drv_info->version)); + ep_offset = ffa_mem_desc_offset(buffer, idx, drv_info->version); + if (check_add_overflow(ep_offset, emad_size, &emad_end)) + return -ENXIO; + + if (emad_end > max_fragsize) + return -ENXIO; + + ep_mem_access = buffer + ep_offset; + memset(ep_mem_access, 0, emad_size); ep_mem_access->receiver = args->attrs[idx].receiver; ep_mem_access->attrs = args->attrs[idx].attrs; ep_mem_access->composite_off = composite_offset; @@ -735,7 +746,6 @@ ffa_setup_and_transmit(u32 func_id, void *buffer, u32 max_fragsize, } mem_region->handle = 0; mem_region->ep_count = args->nattrs; - ffa_mem_region_additional_setup(drv_info->version, mem_region); composite = buffer + composite_offset; composite->total_pg_cnt = ffa_get_num_pages_sg(args->sg); diff --git a/include/linux/arm_ffa.h b/include/linux/arm_ffa.h index 17eca3dfc59e..033c630b271b 100644 --- a/include/linux/arm_ffa.h +++ b/include/linux/arm_ffa.h @@ -445,7 +445,7 @@ ffa_mem_desc_offset(struct ffa_mem_region *buf, int count, u32 ffa_version) if (!FFA_MEM_REGION_HAS_EP_MEM_OFFSET(ffa_version)) offset += offsetof(struct ffa_mem_region, ep_mem_offset); else - offset += sizeof(struct ffa_mem_region); + offset += buf->ep_mem_offset; return offset; } -- 2.55.0.rc0.799.gd6f94ed593-goog