From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f73.google.com (mail-ed1-f73.google.com [209.85.208.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 CEE863644C7 for ; Wed, 27 May 2026 15:02:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779894163; cv=none; b=b5/zOJ6oR/HK9yevbLrXBx0qP3h1rOsBKAJuFIyLkvhqkRG1/j+Jj2jst9VH/kdzWhzFUbaSS/FwO4LcasRq1j5NWLRXD31m4xAloHupt/iEFQpDV7pb34FVZPW/0EvfPltYfufSjfRs83QourTHv1X/4GIZ8Il43vby8d5nlkQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779894163; c=relaxed/simple; bh=ByxUlFkD9YwcgGZp3oksyBn5vqJvrUeByVIcogipJNQ=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=Ilg9os8RXlJsbRH3Cjv99kEl2Mpg4wMV/ZmQPHlNcfTeF37SLsvjvisKsAW05KruSGsTeaUaaMajdvRVS+jjZA0Yc1IoRWGgM0pn5OfoG6CUSnBmULDpGNYzo7GICDQIc7Jlu1qr+6Sb6IPhHIN2sEMNfc9UG/1xXOvKFvQtBuA= 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=YFqbA96P; arc=none smtp.client-ip=209.85.208.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--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="YFqbA96P" Received: by mail-ed1-f73.google.com with SMTP id 4fb4d7f45d1cf-67e9db60e1bso10861571a12.2 for ; Wed, 27 May 2026 08:02:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779894160; x=1780498960; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=t0KYYgCqaB1EQ6tWG+L5HeJwzgQqF0UPRi4lIJbh6P8=; b=YFqbA96P1fgB2L9n5mgCRWAsVmhskTaP7hErc5KT1w4iKy16aF43Q9BwqEIEHKDP6g uLW1GnAMT7zoeJ1uR4H3dndoSJd1rr7PHpIVaedg8HybPkEsA5h/p4AOHM/opdUc9gQp 9xUQcIbl3myC7+YWyXm9UwkxhTePYv/8lY+OMBAAYzvlm2BO9n25w/M1K+nc41OESJRJ +VRceiWP+ngI+fnoOZQopXMVARyt+ZGuSBC/nrFpTmOufAeEacMeBQBF6RSPUi87C43H l1YNb0DAX6ggAmYCWdhKqlp8vO01eRSSW6nWKJSSuSgpfhk+qdmBxIRMpq1P1BjcJ6da ByZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779894160; x=1780498960; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=t0KYYgCqaB1EQ6tWG+L5HeJwzgQqF0UPRi4lIJbh6P8=; b=fhsqLGBUb11QzWGqDKYYkuKrU2K9klbNqbgRMRF1XxIsSI0d/vj4c50vdxtigASp4y dsOhCpydfd5lqrtT6uKVA0b6IyjeA08kFn7MahQrQ96firoVfkebO9a1IbTCsrmAyfPX cXlmg9g8mHDzJUL4xKptLVZkHNFA6YoqhiVRPumHxzLYYNKY+midhQfIZITPN6OgVzUN A7SK/TssQw5NpENnsP1Yfc1T428UsZoQIGS27YaKHurZ2zq6Sr8BM3h3a2YTjCleB12W sUTiMOE8xiZpJhuWVIBkb2PKMUU9/NecOIm0nZK4uf4iRjl3KLhsVII03k5+o+AU4fzB wBXg== X-Forwarded-Encrypted: i=1; AFNElJ/Us0kinEZW5aoBiARNO9hnLoVYFaS/LNyRJV534eY+YF1EWgEMaZAuRobuRlXqT06LgUa2knkALFSRq5M=@vger.kernel.org X-Gm-Message-State: AOJu0YzvpXs7/I9XCMWOkaxJ35rhBwwqKqA8VCcqot2GwIlwIq+E3qUX Q6zFKZqo2Veer+vs4Ag/iX2pgwuULTwQWFdmWUgaXgmknXO5zLgnIZnXKY/NmJCOc7urRJjHPCj x4hmZD+zL1/sWjg== X-Received: from edho11.prod.google.com ([2002:a50:c90b:0:b0:687:b8fd:7b67]) (user=smostafa job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6402:3249:20b0:68a:57f1:44e2 with SMTP id 4fb4d7f45d1cf-68a58107b1cmr2314665a12.7.1779894160042; Wed, 27 May 2026 08:02:40 -0700 (PDT) Date: Wed, 27 May 2026 15:02:30 +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.746.g67dd491aae-goog Message-ID: <20260527150236.1978655-1-smostafa@google.com> Subject: [PATCH v6 0/6] 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. All the patches aside from the first one in optee are urgent fixes as they either impact the hypervisor security or kernel stability. Changelog ######### v5->v6: - Add fixes tag - Small clean up make variable declaration reverse christmas tree. v4->v5: - Collect Sudeep Rbs - Add extra patch to check base address alignment. - Remove WARN_ONs in KVM code - Use ffa_emad_size_get() instead of hardcoded size in KVM code. 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: ######## v5: https://lore.kernel.org/all/20260526151934.3783707-1-smostafa@google.com/ v4: https://lore.kernel.org/all/20260520204948.2440882-1-smostafa@google.com/ 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 (4): 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() KVM: arm64: Ensure FFA ranges are page aligned 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 | 38 ++++++++++++++++++++++--------- drivers/firmware/arm_ffa/driver.c | 21 ++++++++++------- drivers/tee/optee/ffa_abi.c | 3 +++ include/linux/arm_ffa.h | 2 +- 4 files changed, 44 insertions(+), 20 deletions(-) -- 2.54.0.746.g67dd491aae-goog