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 814583FDC14 for ; Mon, 29 Jun 2026 09:36:24 +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=1782725788; cv=none; b=XUNCy2zD6WMuP6YsgLDs5TrLadJNPTErbQJudPHPfXTvuzForAzTJmKF11aPH1qoSfNWuxGhEW8QDfrhIa6k0wTdALiABeBs7ga1BzP6FJajlxY9ynj9DHvbxyc/fcwV5nf4z6bZ9f6ElebfvNsqQ52wgY74lyxtBx0MhhkQi9E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782725788; c=relaxed/simple; bh=7/oUeWfPYnQUwQiE/7VSU2wWtnqYcHPR+rbqfIWy4Ps=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=EU4knEC/yWtbA1Wp6JLve1Ov4dSG4u2Qtq+sbeianUvZku1oVPb2ZcDCuO7ZYvuSrAzo7CiBM+wqWLa5cjKuE6QXloA8rRhG2zbIoQdPK9zwnlLMjQX+FgHiqS6B9aYBChrhKUBqrodIBVCyrdiAsZ27BEBN90oBmmEkleSRExk= 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=RLBQqJvi; 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--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="RLBQqJvi" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-4926596eebcso20254075e9.3 for ; Mon, 29 Jun 2026 02:36:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782725783; x=1783330583; 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=whfBl3Oi2rCM9H5B9AuU1XbX6JklFkv0AY/WgaO+6/Y=; b=RLBQqJviWme3xVoJ8DUg8SuM81/ZbvqY0I4OOaMjnEu4uifkanywxYnYK5oVfPLfMp efYAcM6B4DClJInjd4sg+uUTqpkfunqVRdsY4q3sWG+MwYwn0AYqc7DbK+su0ZO3s/Xz 7WMGcy4MW1r+Edk/KR3JKoy6QfcX7b6yx8qS5NWOCKZzIqw8Aj9zNJb2ZV1qU7TOur55 W8DCrFVIY+9GX6SLYVfjkoAKLTorFIkDkJGodKkVK2OW1mfXqnBhdxVWIm8HJZ08LuGz pAiSFSeihp02+JCY7cCw+JhvCgQfikwU0n3uYe4vPSs+zEokLm4N9ATyngxfu1zEVXmV coBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782725783; x=1783330583; 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=whfBl3Oi2rCM9H5B9AuU1XbX6JklFkv0AY/WgaO+6/Y=; b=C7Io87GBUW5QQN4EpDE2a4nhrfNbzMl1Ff0j5ImvLn8GEJp5imD0QDUA4I97mAZbA0 vmvcvZCqRZ2YctGtG8GKTrbAM19IwSZM342Pre5uzHXSFtL5chGU0ud3zqSirqfxYYha qKvM5Rd5PEtqfXFxNoo5FVtRszjMy/P9pwQKnqP5FOK7YAt4i3uVV6uQPkOtKfG9W9V9 ECnfT9JCoD2pfKXV1uZGp1LckQNEe6snwMZ7llaaA/GH2TAEpK1PfNyyvblVxNblyTg9 x+7ApzaKxw/ck2BsPc0RYqU6tfxaJvsMwUOl8hgre/bJ4YyKzlDu4+s+7ysQyqDZ1JP+ 2Rfw== X-Forwarded-Encrypted: i=1; AFNElJ8/FOmaQ4e304N3GJWxQY7ihkBG9j183/e70c/fGev0bU3iAIC/p7M/c4s+XswkfuuzLgrmi9S8oDoITOU=@vger.kernel.org X-Gm-Message-State: AOJu0YzWaALYmFbRI0efKE+T6EjDxOABNWzW3aK3pPumPnOySdr5n3NO 2q6XBqxrASsygPVsYRxPkcOl0eQEAa2Yh3P0eP2jPvg/yNL/VPTpsylnGvlPoAc1vW6TD7YOvEe bgdpNul3SfT/eHJibpPCnTEzQ0v459g== X-Received: from wmlm15.prod.google.com ([2002:a7b:ca4f:0:b0:487:3739:c5c4]) (user=sebastianene job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:c118:b0:492:6881:1114 with SMTP id 5b1f17b1804b1-49268811131mr188559705e9.0.1782725782622; Mon, 29 Jun 2026 02:36:22 -0700 (PDT) Date: Mon, 29 Jun 2026 09:35:58 +0000 In-Reply-To: <20260629093558.2425257-1-sebastianene@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260629093558.2425257-1-sebastianene@google.com> X-Mailer: git-send-email 2.55.0.rc0.799.gd6f94ed593-goog Message-ID: <20260629093558.2425257-8-sebastianene@google.com> Subject: [PATCH v7 7/7] KVM: arm64: Enforce strict SBZ checks in the FF-A proxy From: Sebastian Ene To: catalin.marinas@arm.com, maz@kernel.org, oupton@kernel.org, will@kernel.org Cc: joey.gouly@arm.com, korneld@google.com, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, android-kvm@google.com, mrigendra.chaubey@gmail.com, perlarsen@google.com, sebastianene@google.com, suzuki.poulose@arm.com, vdonnefort@google.com, yuzenghui@huawei.com Content-Type: text/plain; charset="UTF-8" Introduce a helper method ffa_check_unused_args_sbz to enforce strict arguments checking when the hypervisor acts as a relayer between the host and Trustzone. Signed-off-by: Sebastian Ene Reviewed-by: Vincent Donnefort Acked-by: Will Deacon --- arch/arm64/kvm/hyp/nvhe/ffa.c | 96 ++++++++++++++++++++++++++++++++++- 1 file changed, 95 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c index 712811e89435..334f8a28d942 100644 --- a/arch/arm64/kvm/hyp/nvhe/ffa.c +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c @@ -74,6 +74,21 @@ static u32 hyp_ffa_version; static bool has_version_negotiated; static hyp_spinlock_t version_lock; +static bool ffa_check_unused_args_sbz(struct kvm_cpu_context *ctxt, int first_reg) +{ + DECLARE_REG(u32, func_id, ctxt, 0); + int reg, end_reg = 7; + + if (hyp_ffa_version >= FFA_VERSION_1_2 && ARM_SMCCC_IS_64(func_id)) + end_reg = 17; + for (reg = first_reg; reg <= end_reg; reg++) { + if (cpu_reg(ctxt, reg)) + return true; + } + + return false; +} + static void ffa_to_smccc_error(struct arm_smccc_1_2_regs *res, u64 ffa_errno) { *res = (struct arm_smccc_1_2_regs) { @@ -242,6 +257,11 @@ static void do_ffa_rxtx_map(struct arm_smccc_1_2_regs *res, int ret = 0; void *rx_virt, *tx_virt; + if (ffa_check_unused_args_sbz(ctxt, 4)) { + ret = FFA_RET_INVALID_PARAMETERS; + goto out; + } + if (npages != (KVM_FFA_MBOX_NR_PAGES * PAGE_SIZE) / FFA_PAGE_SIZE) { ret = FFA_RET_INVALID_PARAMETERS; goto out; @@ -318,6 +338,11 @@ static void do_ffa_rxtx_unmap(struct arm_smccc_1_2_regs *res, DECLARE_REG(u32, id, ctxt, 1); int ret = 0; + if (ffa_check_unused_args_sbz(ctxt, 2)) { + ret = FFA_RET_INVALID_PARAMETERS; + goto out; + } + if (id != HOST_FFA_ID) { ret = FFA_RET_INVALID_PARAMETERS; goto out; @@ -424,6 +449,11 @@ static void do_ffa_mem_frag_tx(struct arm_smccc_1_2_regs *res, int ret = FFA_RET_INVALID_PARAMETERS; u32 nr_ranges; + if (ffa_check_unused_args_sbz(ctxt, 5)) { + ffa_to_smccc_res(res, FFA_RET_INVALID_PARAMETERS); + return; + } + if (fraglen > KVM_FFA_MBOX_NR_PAGES * PAGE_SIZE) goto out; @@ -485,6 +515,11 @@ static void __do_ffa_mem_xfer(const u64 func_id, u32 offset, nr_ranges, checked_offset; int ret = 0; + if (ffa_check_unused_args_sbz(ctxt, 5)) { + ret = FFA_RET_INVALID_PARAMETERS; + goto out; + } + if (addr_mbz || npages_mbz || fraglen > len || fraglen > KVM_FFA_MBOX_NR_PAGES * PAGE_SIZE) { ret = FFA_RET_INVALID_PARAMETERS; @@ -584,6 +619,11 @@ static void do_ffa_mem_reclaim(struct arm_smccc_1_2_regs *res, int ret = 0; u64 handle; + if (ffa_check_unused_args_sbz(ctxt, 4)) { + ffa_to_smccc_res(res, FFA_RET_INVALID_PARAMETERS); + return; + } + handle = PACK_HANDLE(handle_lo, handle_hi); hyp_spin_lock(&host_buffers.lock); @@ -764,6 +804,11 @@ static void do_ffa_version(struct arm_smccc_1_2_regs *res, { DECLARE_REG(u32, ffa_req_version, ctxt, 1); + if (ffa_check_unused_args_sbz(ctxt, 2)) { + res->a0 = FFA_RET_NOT_SUPPORTED; + return; + } + if (FFA_MAJOR_VERSION(ffa_req_version) != 1) { res->a0 = FFA_RET_NOT_SUPPORTED; return; @@ -813,6 +858,11 @@ static void do_ffa_part_get(struct arm_smccc_1_2_regs *res, DECLARE_REG(u32, flags, ctxt, 5); u32 count, partition_sz, copy_sz; + if (ffa_check_unused_args_sbz(ctxt, 6)) { + ffa_to_smccc_res(res, FFA_RET_INVALID_PARAMETERS); + return; + } + hyp_spin_lock(&host_buffers.lock); if (!host_buffers.rx) { ffa_to_smccc_res(res, FFA_RET_BUSY); @@ -860,9 +910,15 @@ static void do_ffa_part_get(struct arm_smccc_1_2_regs *res, static void do_ffa_notif_bitmap(struct arm_smccc_1_2_regs *res, struct kvm_cpu_context *ctxt) { + DECLARE_REG(u32, func_id, ctxt, 0); DECLARE_REG(u32, vmid, ctxt, 1); struct arm_smccc_1_2_regs *args; + if (ffa_check_unused_args_sbz(ctxt, func_id == FFA_NOTIFICATION_BITMAP_CREATE ? 3 : 2)) { + ffa_to_smccc_res(res, FFA_RET_INVALID_PARAMETERS); + return; + } + if (vmid != HOST_FFA_ID) { ffa_to_smccc_res(res, FFA_RET_INVALID_PARAMETERS); return; @@ -879,6 +935,11 @@ static void do_ffa_notif_bind(struct arm_smccc_1_2_regs *res, DECLARE_REG(u32, flags, ctxt, 2); struct arm_smccc_1_2_regs *args; + if (ffa_check_unused_args_sbz(ctxt, 5)) { + ffa_to_smccc_res(res, FFA_RET_INVALID_PARAMETERS); + return; + } + if (FIELD_GET(FFA_NOTIF_RECEIVER_ENDP_MASK, endp_id) != HOST_FFA_ID) { ffa_to_smccc_res(res, FFA_RET_INVALID_PARAMETERS); return; @@ -900,7 +961,7 @@ static void do_ffa_notif_unbind(struct arm_smccc_1_2_regs *res, DECLARE_REG(u32, reserved, ctxt, 2); struct arm_smccc_1_2_regs *args; - if (reserved) { + if (ffa_check_unused_args_sbz(ctxt, 5) || reserved) { ffa_to_smccc_res(res, FFA_RET_INVALID_PARAMETERS); return; } @@ -926,6 +987,11 @@ static void do_ffa_notif_set(struct arm_smccc_1_2_regs *res, return; } + if (ffa_check_unused_args_sbz(ctxt, 5)) { + ffa_to_smccc_res(res, FFA_RET_INVALID_PARAMETERS); + return; + } + if (flags & GENMASK(15, 2)) { ffa_to_smccc_res(res, FFA_RET_INVALID_PARAMETERS); return; @@ -947,6 +1013,11 @@ static void do_ffa_notif_get(struct arm_smccc_1_2_regs *res, return; } + if (ffa_check_unused_args_sbz(ctxt, 3)) { + ffa_to_smccc_res(res, FFA_RET_INVALID_PARAMETERS); + return; + } + if (flags & GENMASK(31, 4)) { ffa_to_smccc_res(res, FFA_RET_INVALID_PARAMETERS); return; @@ -956,6 +1027,20 @@ static void do_ffa_notif_get(struct arm_smccc_1_2_regs *res, hyp_smccc_1_2_smc(args, res); } +static void do_ffa_notif_info_get(struct arm_smccc_1_2_regs *res, + struct kvm_cpu_context *ctxt) +{ + struct arm_smccc_1_2_regs *args; + + if (ffa_check_unused_args_sbz(ctxt, 1)) { + ffa_to_smccc_res(res, FFA_RET_INVALID_PARAMETERS); + return; + } + + args = (void *)&ctxt->regs.regs[0]; + hyp_smccc_1_2_smc(args, res); +} + bool kvm_host_ffa_handler(struct kvm_cpu_context *host_ctxt, u32 func_id) { struct arm_smccc_1_2_regs res; @@ -984,6 +1069,11 @@ bool kvm_host_ffa_handler(struct kvm_cpu_context *host_ctxt, u32 func_id) switch (func_id) { case FFA_FEATURES: + if (ffa_check_unused_args_sbz(host_ctxt, 3)) { + ffa_to_smccc_res(&res, FFA_RET_INVALID_PARAMETERS); + goto out_handled; + } + if (!do_ffa_features(&res, host_ctxt)) return false; goto out_handled; @@ -1030,6 +1120,10 @@ bool kvm_host_ffa_handler(struct kvm_cpu_context *host_ctxt, u32 func_id) case FFA_NOTIFICATION_GET: do_ffa_notif_get(&res, host_ctxt); goto out_handled; + case FFA_NOTIFICATION_INFO_GET: + case FFA_FN64_NOTIFICATION_INFO_GET: + do_ffa_notif_info_get(&res, host_ctxt); + goto out_handled; } if (ffa_call_supported(func_id)) -- 2.55.0.rc0.799.gd6f94ed593-goog