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 4BACA1C860C for ; Tue, 26 May 2026 15:19:46 +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=1779808787; cv=none; b=k+pOHh4HcGjFGXkxMxj9R7XA982DYi6ZqSIghzRACL6ybg4PM2MnydumrzVqVgIu/BbqNdltnHdnCus67Kygo502od58CoInltk/EbsltFGlyH+WabJAEfZCrJomyYQ2itlj7oVNzv26AfOHqVJPSbjw5IkAn7gKrZeH6PRZua4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779808787; c=relaxed/simple; bh=kViNV8bt1ZUesG6y4m7RkUFq2YymwQWHXWgrRE5dr7w=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=V5Mhu8skGIjINMnIsu1B0EtuL5O4jEVcmYMA0fMfcCCIYosMrJ9P4bgv0NxNz9WsvftBOFmpXq4gzIgAVxmKJsKNnXXKer77gT56KtEkIjHVSTvkzyYt0eRFbeetsCMmrcbaNtfawezdaOpDl3+XoACKStK+HN5kgAgKeKtjwgI= 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=josrmQnj; 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="josrmQnj" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-48fd64c32e8so72644325e9.3 for ; Tue, 26 May 2026 08:19:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779808785; x=1780413585; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=lrWlfTK5Lutt6aW80bi7cx4j7i0TUVnce7pHBOYoWwo=; b=josrmQnjbN9ByAhnYBwNgOQSYESBNSIcj14KIrtvu47/JgyZwcT2AsLUnzRthDpBxt Pt455sC/qTfJCK+qp8j/9TVUIbKHn2c2a6TrPV809AoMT7WRM3XWz+4M0JIXO2zVWC7Y oX6KQsKE+4/fO+DygKtGuVZgBnl9gTyNjdjxS4rDmmbLQwY87Fnf6dP7f22tNHuwNlhQ kbPrXqmWpqneL1EhK5sKPbDyYJ76T0QQxfGXnP5W3P2FwjifL00j5SHsjbGg0VhwE2pw sNNNeqIL6W6bo+EDN4Gm5xI1YWFrE6C99MUaVrZ76DrIbQWB0ZjKGVDpWLo9njAFReJ8 xQGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779808785; x=1780413585; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=lrWlfTK5Lutt6aW80bi7cx4j7i0TUVnce7pHBOYoWwo=; b=EcLCcSENGRgyzuhi+8HFfggjg2gZHnjSamBo/ZB8wkWwJIJP8TDU/4Gx7UQe2Pfue2 KLO+7e8Fc3ugeEl9rdCe3PllbcwyMrDG+/F4r7KFt+hIDZKw2tE0rF7bawSFzcdFjozj ycZj268RPjLTZhw2EZG0z471yxjfAXYreVcbiHfhf6n4a3+EPH6srqy++SNxJQfuTjxl FkWXb85GJdZvcd4eewtxLrJCfoXuBFlsGm0mQPrI9TUDaTRlFL9ZxfUF/Z4E+AEltZrn LTesA+WSdfz62Fo7+Dua1BGeGH1d2s+JrDD+GQX76etwOYMlLrGc7KWjxD9Ik9CHFnk4 tOeA== X-Forwarded-Encrypted: i=1; AFNElJ/5ske2mnJjR5hwXBQeXQfbPnMdczKA0iDwGLyS0+AME9pb9S2Z/oimXxd9MaqzH77ssl8YV+Mq78kCQ9w=@vger.kernel.org X-Gm-Message-State: AOJu0YzXPb5gBk8i5yKKVgCXFf1mMIebSGVO9Qct/2cnqspwhf+x6W4Y ctud1+HK9W2MwX/SfU947T0o4wKGLGHGhJ8+lWfqf9AVmCum+pKb5OlM8h31B4nI668cb9tOSkO loEiDAaPJKbeBoA== X-Received: from wmbem24.prod.google.com ([2002:a05:600c:8218:b0:490:51ba:4f8]) (user=smostafa job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:4511:b0:490:6869:46c3 with SMTP id 5b1f17b1804b1-490686947bemr126353045e9.30.1779808784404; Tue, 26 May 2026 08:19:44 -0700 (PDT) Date: Tue, 26 May 2026 15:19:28 +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: <20260526151934.3783707-1-smostafa@google.com> Subject: [PATCH v5 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. Changelog ######### 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: ######## 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