From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) (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 88518375AB2 for ; Wed, 20 May 2026 20:49:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779310199; cv=none; b=OmnWwq18CXIEMto32gIooJfW5IaDzwTkOvHsv405WKpiQYFqhrxQynTE9r1KOqfeZQQj3pTykBEdEJjcTGnNCa9QVvJHzHHAtSVoDmbVcgRxslwGGgtwTtGbm2Q63it/LV/+qekzLprRCZgxY2RhDavNaIiTedTGk2x0FO9gJHs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779310199; c=relaxed/simple; bh=yEi7Y+sVV03MbE//ByLa4jBWlRzkala7BxfSNn0p1q4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=m/SnZBuwUfnpE6w5xgy/jFXnlj2Ul2ifY4iLZohpe0ObpRk+19hL7NXjkoiFlGmpZkLd7hc0yE1nWFL5vV/mNiB/lfWDUSScDeX+V9BLS7CpNtafOY1kuWm8ygfWcmLLWZ4dkfZ/1kGsDoGroD8XQDGO5gzX1nNKB+UfQsyXDrk= 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=V9gzz/pl; arc=none smtp.client-ip=209.85.128.74 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="V9gzz/pl" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-48a589c7879so40996455e9.1 for ; Wed, 20 May 2026 13:49:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779310196; x=1779914996; 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=h6pS+fRCyL3l4ecLcUFyDog+3129i4iHhu9NlGGm/nY=; b=V9gzz/plp/qVxFrKIFdvomhRXNW/ypyCBRr/GQi1d/yckIYDFTPFSLlnF//PFCR5yr ka9heFvIKmQoadQIvpDlV5x6SE9L+bFihytbIF3nfkcTGu74Z4Smp6YJYeCoxSkTMlez +f0+ubVVlMohvkA78IikduFSAd4OTmq49W6vAlmxgoTmcRgI3NKXU5UqADKa5sPq62ge Ucw7eXaaNnz5MUXxzO/Q7K2KrkUyIpLgaQ0FN2wPpFjC7hbNwyprCyAnuEZJcA9oq/A9 gWG4U0ANhp+GymA3Kj+Al2ysbs/l602PD5R5S5aBWhELHu8eLBvQ//ST5qHfNXFHehdi gCtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779310196; x=1779914996; 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=h6pS+fRCyL3l4ecLcUFyDog+3129i4iHhu9NlGGm/nY=; b=ToNSyYYxB6mWtY36VvrfyUQiUIRrg7bQwPd+kXB9Ksr3fSC9ZpnsUf0raSpcG4bUEY lAaSQf8U30iG8vxGBG23hL/iTc1f54u8fy2krnpogq2UGtAi1cSD9FQCQdQ019VpHsK/ PK0DmidxEC/bao2s0dBgplcmg4/DiD/D3dUogjOvdqO0q6kamgZTs6QxJ0eoM0G8hNI/ 0O6MrO661hJWR4voS+rBw7md5pUmpmElrnjWLuM4kwRmA80kIEWXMMY59F0ZRLmrKxoO gCLSmGYzxpe/6vMMOr+miFx0xCtFzbIg0uCoERivSAkQkyUHYeHEdxisOi/UsW97p+Fq HdiQ== X-Forwarded-Encrypted: i=1; AFNElJ8D90ZSiDWm2912owRIqc9y56UTfIaEBjU7jTEYBWTkDXsR+Uu2pe2JTlCSTlcrF8yUwuvDce3O1nN1Lsw=@vger.kernel.org X-Gm-Message-State: AOJu0YwwpwG/n4hLTRQxbF0Ll8oBqwjXcHDTDVW4ecY9IIWZF1x9xYRk xd+LRNGZ6FFHyeCLflLIvGYDjxFWGeduW8SSeqpqKwpCyxMR8jAqBZyZyB8QmZBnNWxVqk/jN2k hR6RARULwrhA17w== X-Received: from wmfo22.prod.google.com ([2002:a05:600c:2e16:b0:489:d74d:f20]) (user=smostafa job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:c08b:b0:48a:79d8:a8d6 with SMTP id 5b1f17b1804b1-49035f37f95mr624375e9.7.1779310196037; Wed, 20 May 2026 13:49:56 -0700 (PDT) Date: Wed, 20 May 2026 20:49:46 +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-4-smostafa@google.com> Subject: [PATCH v4 3/5] firmware: arm_ffa: Fix Endpoint Memory Access Descriptor offset calculation 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 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`. Signed-off-by: Sebastian Ene Signed-off-by: Mostafa Saleh --- drivers/firmware/arm_ffa/driver.c | 16 +++++++++++----- include/linux/arm_ffa.h | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/firmware/arm_ffa/driver.c b/drivers/firmware/arm_ffa/driver.c index b700b2e93e72..8573a7a6556e 100644 --- a/drivers/firmware/arm_ffa/driver.c +++ b/drivers/firmware/arm_ffa/driver.c @@ -685,19 +685,26 @@ 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_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 (ep_offset + emad_size > 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; @@ -707,7 +714,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.669.g59709faab0-goog