From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f201.google.com (mail-lj1-f201.google.com [209.85.208.201]) (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 20BF13EF0A8 for ; Tue, 30 Jun 2026 10:21:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782814886; cv=none; b=UUwTEWvjebxrse/aB0jjP8wgJaGSqTpnAxYvzwEzBcWsjJ7MTIKF6F+C6NPVj1r6AIbehnBrlmCSNuFK5IlO5h7aGFLNQj0ppQM8+E+3U14biZ2e6/eHYLh+BY3QXZ4S3gZCfMzcsovTKtpQd5CXofBGYptIbmcqSKQPs2XJIFM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782814886; c=relaxed/simple; bh=9TOnq1jD0pgHaO1v5HJoXAFTZmNdtts5+PujmRUbv1g=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=i8yWPNydb/JnJr3DHcSTOhbSUU23l7BzDlTPKxrurxLJNkV0yS4SDEPkezrq9l20lfkUiP9ryXLqMqIVEbw47reDwULDEgR0XYcypMg01fc48BCInZzyQD9oAzNSuo6L0m+MiV5cZEVsF9fzh1zBAvfi8YE3rrvRLX3yz+Jc/ms= 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=kqgxvAIs; arc=none smtp.client-ip=209.85.208.201 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="kqgxvAIs" Received: by mail-lj1-f201.google.com with SMTP id 38308e7fff4ca-39adcede08cso16790841fa.2 for ; Tue, 30 Jun 2026 03:21:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782814883; x=1783419683; 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=kqgxvAIsHxzwlZpkJTZTl6OEWIhuKFbQiWHCXvhnHo/WmvHOYkbfn1pkUYuUTEfCF+ FxHBiZwvS8t/aupQe5PmitM1pQQnaAVgEh3AfiTw5ELR+uoV9ZXkvIByRMz0Ttx1EyWC raWBr8JlfOJVAVIR6RHNVkkGjF3cbiayfKVuReYj/JfibDi59l4jtoy/jiA8/eJtadQo kOcX8agqYYB5g/DE6JzT2AMFDnl3/FhyjlCf5bMY6prhilDeG3lEiJCqNYxrasfiz1B+ 6g7gIt0E+BIVUdZLZYgUd5JqAAhvYgTDzuqk2vVX815o5Xi9/2dV0Ub0rQ+jt98SgvOF 3k/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782814883; x=1783419683; 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=Do2taInERJ02gTJPVVwIEzXJQcRdP4L/s4GqwjK14RGapJ0LLAQzv8CMu1C22k8YF5 c9lYIppsB83Ch8BUf3R6IA6hA+LBovZcAQr0fHERuqS4DYrQ+0ysu/7CWGZtduVN0px3 Dad6++s9AErrfpq3aID/4ZOFxFSI9rhtCmJ7FgBRqNhFOf2/aHvKjfFOmvISUQIc9ZTI M0IOKbscSv8KuPkrGj7KbIvNsKKTCxq5Xe4vBS+iKOUAmHDkWC2jaAvlFzZxqGg1Ukyr eyokeW+L2YUUDlBGMHTMBMCeKzbCI4bFc3X8t8uKxU+kKeQd26zV7F3MUgg/WjKkZn1i PFsA== X-Forwarded-Encrypted: i=1; AHgh+RpvJraTyjQENGML/FQuQuRTtI6Ey059eCRpwJDIBQ+9eZUd6yy4+ZeOzOuvS6U9rz0qVPQI6hLYyYzN2Dg=@vger.kernel.org X-Gm-Message-State: AOJu0Yw2tb4pF54eB7Sd3SQcbsavdUQ5GetOqkq4HjOS2zXm3qLdmGnY T/43zUFE6aVWbbQXvCW3E3qWvO5Tz8/sH0FsMn3LCfJwF88TUZ7UziWBpO730KuDbiRHkjGo8A7 Yz+n25W4MXopm6lt70E8ybom92Xvkxw== X-Received: from ljvg16-n1.prod.google.com ([2002:a05:651c:2550:10b0:39b:23be:9b9d]) (user=sebastianene job=prod-delivery.src-stubby-dispatcher) by 2002:a05:651c:1603:b0:39b:f64:1af3 with SMTP id 38308e7fff4ca-39b28d2233fmr386661fa.8.1782814882959; Tue, 30 Jun 2026 03:21:22 -0700 (PDT) Date: Tue, 30 Jun 2026 10:20:55 +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-4-sebastianene@google.com> Subject: [PATCH v8 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