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 A96E12F5487 for ; Wed, 20 May 2026 20:49:54 +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=1779310197; cv=none; b=W/l5VvaMqCGDUrp01aBOcXRLkzyDBgSY/GPkT7mTaqiTY0MK1rjk7rm/ly7g3fCuefCWkHAQqr1VQAJBJhcqmtppvl6KwqeGHB/yA4mt6E7IDlLVAay5SEYAReKeknchpPmIBCEJ6htARZgI/YABPZDOwrQeO3kPjYxXA6t4Yt4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779310197; c=relaxed/simple; bh=O8asY9iehL0nCxQ7X/jU9CAwMx7UcWlswYFwKXvB8Fc=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=b2QeUVuuIVCfxbYsZ4xlBx2apuTBp3gAjIDBbzGNXTavOUlHE0by02LaoHp5haYqqBHP6DiwF4QTtvi8PEc7Se2/5PGvWSmnq2AUWEr0pT56TC5MoA0usLEoev8meyhSqgzymKM9cF3FyDoup1cCPjrNY8HEdMTVGy8mDCJXjG0= 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=lKX+5kgu; 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="lKX+5kgu" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-48fe44ce385so42695015e9.0 for ; Wed, 20 May 2026 13:49:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779310193; x=1779914993; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=pLV0D8OV4jhyDEJovr2ZsBSnuczUGhYNsjjzP+Stc4o=; b=lKX+5kgu5kUw+0U/xTNZNKIj3PoM1w8csEZFqzeaimJW+fxxGYo8ijYYGssoaHbBBl cNTMpR308MgYbS43Dcg6uWcT0w29KZ+2B4yV8p7Mu5oYe8j1HYoqiudRzUBb5wUvRuR/ iLDtt/GpQCL2PWkWYX8ZgCq2rdoi2WJPro6HA+qvQ8uG4DvoPRy5Qou8ByvRvhSq+go9 prtx7y+YSaf27SVzi+GIhp8LZOOZe3o3q8Z9gDQ2aH8Ax1PVbilHJE8Q6L58EUMG4pz4 ejFVaqYo94irw28JqV8yNpp0CpJXpnwlMWXbaJmR46Nm4gZvpGm/1UAaAogjUKJYMY9H hWmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779310193; x=1779914993; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=pLV0D8OV4jhyDEJovr2ZsBSnuczUGhYNsjjzP+Stc4o=; b=otrHev8s1tZFaVM2++QHAFUPaJwJbtwKhcJrelode50fb/ZKJoAxaV8LhsOHGjHYRs EMvAYI0S5YIsIEF7PEdpJ9C1dMXiVQVsusBolctHX9QzqNZntPsAEQWB8MTFf9mvMxFd ktUciVoKB00Dzar7Qd5IwHvfoGyT0jPzBCnrxy94xVx/tFZIfckGezj8K95e05Pf5gzE JzysprylDnzQlJRYCCyKsv6y7c0tvMORq/xtStaPbSkexI2lwTY8HNQPYIA10azNJn5D bIuwm0DcrFH1vBgp+/Xw0zmnKlnzcMxvo2UtgatvwY16b7BHjYib6Wxh510QsHpFoU6e +yAA== X-Forwarded-Encrypted: i=1; AFNElJ9ZHVMDZmvxB4R20WyZnNPJQOAkYYL0HLf2WLgcZEbdaKOE82q87Q3l6HS8Q79vfRl+KwMKml9TQTJVpZc=@vger.kernel.org X-Gm-Message-State: AOJu0Yxh5LGdTSsBpNBgnJqLnI8dflXsVgd9bFiDuYRnMlujwJovIYPB E7LEKzdmPLLN+1ewU1WDFlVV7fMb30YXvfBLRuIavdeW7meCxpw4OJ4w9opjol6UbQMJKumnv+S 95mkxINgHkZBvVQ== X-Received: from wruh9.prod.google.com ([2002:a5d:6889:0:b0:444:bd72:fec6]) (user=smostafa job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:138f:b0:488:ae6c:42c6 with SMTP id 5b1f17b1804b1-48ff4f4f44dmr311573965e9.14.1779310192858; Wed, 20 May 2026 13:49:52 -0700 (PDT) Date: Wed, 20 May 2026 20:49:43 +0000 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.54.0.669.g59709faab0-goog Message-ID: <20260520204948.2440882-1-smostafa@google.com> Subject: [PATCH v4 0/5] arm_ffa, KVM: Fix FF-A emad offset calculations 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" Hi all, This series fixes the Endpoint Memory Access Descriptor (EMAD) offset calculations and adds the necessary bounds checks for both the core FF-A driver and the pKVM hypervisor. Prior to FF-A version 1.1, the memory region header didn't specify an explicit offset for the EMADs, leading to the assumption that they immediately follow the header. However, from v1.1 onwards, the specification dictates using the ep_mem_offset` field to determine the start of the memory access array. The patches in this series address this by: 1. Updating the core `arm_ffa` firmware driver to correctly calculate the descriptor offset using `ep_mem_offset` rather than defaulting to `sizeof(struct ffa_mem_region)`. It also introduces bounds checking against `max_fragsize`. 2. Enhancing the pKVM hypervisor validation logic to no longer strictly enforce that the descriptor strictly follows the header, aligning it with the driver behavior and the FF-A specification, while also ensuring the offset falls within the mailbox buffer bounds. While addressing these bugs, Sashiko uncovered other issues that were fixed in the same series. Changelog ######### v3 -> v4: - Address review comments and fix Sashiko bugs v2 -> v3: - Fixed typo in nvhe/ffa.c (missing sizeof) v1 -> v2: - For pKVM, removed the strict placement enforcement for `ep_mem_offset` as it is not compliant with the spec, and avoids making assumptions about the driver's memory layout. Link to: ######## v3: https://lore.kernel.org/all/20260512124442.1899107-1-sebastianene@google.com/ v2: https://lore.kernel.org/all/20260430160241.1934777-1-sebastianene@google.com/ v1: https://lore.kernel.org/all/ae9KN9nkOgDYJcGP@google.com/T/#t Mostafa Saleh (3): optee: ffa: Add NULL check in optee_ffa_lend_protmem firmware: arm_ffa: Fix out-of-bound writes in ffa_setup_and_transmit() KVM: arm64: Fix bounds checking in do_ffa_mem_reclaim() Sebastian Ene (2): firmware: arm_ffa: Fix Endpoint Memory Access Descriptor offset calculation KVM: arm64: Validate the offset to the mem access descriptor arch/arm64/kvm/hyp/nvhe/ffa.c | 30 +++++++++++++++++++++++------- drivers/firmware/arm_ffa/driver.c | 21 +++++++++++++-------- drivers/tee/optee/ffa_abi.c | 3 +++ include/linux/arm_ffa.h | 2 +- 4 files changed, 40 insertions(+), 16 deletions(-) -- 2.54.0.669.g59709faab0-goog