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 4CDC54534B9 for ; Wed, 17 Jun 2026 14:51:46 +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=1781707907; cv=none; b=OG2ImlEWiaaQe/xJC1Br1nbxSHLSX6Ux079v1Rxf133428R8e61vf0gvoBgmfR60eaZLj8Jx1dJz4qNhLEDYQFsg9d+qcary1Nb8SNQq1wE2b6Lp58DjmiWCmfFtLdefWuVgqjTBf27fyG8aneWczZg01irnQpF/paEgtLPVuWQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781707907; c=relaxed/simple; bh=aN8Nyn9ckrh0MM/LzHi6OOLo2IpLuaUhgYlQz9xxDvk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=uQsULQ6uXhcHUMaX5BhXoMmU3VlCE/ceINLeMhOv9mLRHKUzeHSRnm9PVtIUVesOtXD/gU0qSAB8mivkewSFPIZCESVP4rMJpOu0T4gUic6toUdg+DpF/42nKvxTY+VeSHP8wcE/T0MVEI32u8P464qAfvS+ix4JRJytofrWVek= 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=IVCfDx2S; 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="IVCfDx2S" Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-4621b17733cso600111f8f.0 for ; Wed, 17 Jun 2026 07:51:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1781707905; x=1782312705; 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=iSPN5hE9gskxSS4lEDSt/fOL7Hb/rZVNl7XMRMHJyec=; b=IVCfDx2SsUqhaUvuhmZO3Uq49y4yaliNvb6FnIQihPt08Z+f1H0CtjvwbvcMmQmhYq B37jBNkj+sLNTQuHHXVGTY3tVJWfkW7uS5yHaZArSDVIemsIpt9kPI0tJsFKK9Sw5IFb ylnbVoQjBKEXRlh2DWPj4lHfNF+cARR2iXhbfZnZu687eU0UMSEzFskMGHvxIqsXPE8Z 8/Fao3lmPgVWk45ho95a+WI2YxSjeOW/pmi6hCDGhlxgrnS0ZiSRP8vRKoD+aRgsBgAD otdfPIey5QWCTgShbuZ3QyMdgItC6y2KggObF9P8RzfzHPMpa9KOGBl2I8H6EqaOEd/f +rsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781707905; x=1782312705; 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=iSPN5hE9gskxSS4lEDSt/fOL7Hb/rZVNl7XMRMHJyec=; b=CoUqPcA7EbE6uqJ4Um5MPftgzKInfiRjtz9u8r9cQNq586tWV6Ks1JbgKtGmA+HhVQ TNLIg0s5Zt42Spu99LNMiy7SrmNH/mjxQD8qyEopDgUb5NkHmpDmZvANUAzsqUBWtPzM 5Dav2tGxetxqyycqm1/3A+fqRxsuYvbaRn7+k3N4r8VZ8NugFfn4zOymFSaJuqhfsGFt Vz9h8XIYD25PZRJpPlc6w33O41s/UAefpif9DRuNwbvma1KJVsEzo0iVTN2SFIOwVjee lJkpvPIA9OHQG5LUEGsZoRdpu4w2dKPQUK0CPwnqy02WF9UfdKREPdTi00Kde4XJ+fbd 1xJg== X-Forwarded-Encrypted: i=1; AFNElJ8IfuEQKNL3O165xYK5pg5cDdYDwfasfcbVBAynLEjaqdzkpZvU0ZOaNCNpEeglIJ7U9p4ZcfFVEZf/MW4=@vger.kernel.org X-Gm-Message-State: AOJu0YykU5meZFZzICPYyFgWtiXDSZW9npfsiWPN87yTupeQYPnF8ZH6 bkultbSRoAeSYFk0Qu1JA1q9Px3aRWMVrYWfN/Jq4JQ3VJh7Cu0f08XLX2hpmIvxN4VVfHT47AJ LQ1aZsX2jv4Ad37zDqy6Z0F8puyq7tw== X-Received: from wmbgx24.prod.google.com ([2002:a05:600c:8598:b0:490:b0f1:3417]) (user=sebastianene job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1f8f:b0:492:3670:85a7 with SMTP id 5b1f17b1804b1-4923677d803mr26521325e9.35.1781707904134; Wed, 17 Jun 2026 07:51:44 -0700 (PDT) Date: Wed, 17 Jun 2026 14:51:26 +0000 In-Reply-To: <20260617145130.3729015-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: <20260617145130.3729015-1-sebastianene@google.com> X-Mailer: git-send-email 2.54.0.1136.gdb2ca164c4-goog Message-ID: <20260617145130.3729015-4-sebastianene@google.com> Subject: [PATCH v7 3/7] 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") Signed-off-by: Sebastian Ene Reviewed-by: Sudeep Holla Signed-off-by: Mostafa Saleh --- 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 059e2aae7ca0..92edf397bcd2 100644 --- a/drivers/firmware/arm_ffa/driver.c +++ b/drivers/firmware/arm_ffa/driver.c @@ -703,19 +703,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; @@ -725,7 +736,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 81e603839c4a..62d67dae8b70 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.54.0.1136.gdb2ca164c4-goog