From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.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 487993F0ABE for ; Tue, 30 Jun 2026 10:21:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782814894; cv=none; b=QdigWHXUU21YhBiolXa2sUZqWomGfsOwTUxeoIvqkZg6DyobShfMeVZGNikiKTt96A4g9qafA9Il+S750s7LWv7TNTIQp7mRp2Hxyy7SXeOouraM4zhaz0DIj9rsBktfKMH/ioF25TLMZ/DGX9efj4s+frof8JkYfoFLDsxl7pg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782814894; c=relaxed/simple; bh=mJH6zKl+wPnI8Gh9eK/dhD8a6MoXLFehdUoz/1vLpUI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=KRzFgd9qJeva9MM1dwEsxVAbMDcSyK+zJ+14hZYks3qUPszuz5+dwiyZLkb/Jn+XfCLmVs91ZhkRxgFJMtLWKW4Az1ZVafsP1L+5rWJbyH6q/QS7qcgbZY+hhcjsJ/a9Yl3xwGtY7iWiQGii4oHmtR/r2TRhnhEDgI1mkHx72Lk= 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=hlya0Mu3; arc=none smtp.client-ip=209.85.128.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--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="hlya0Mu3" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-4926d371224so26621825e9.1 for ; Tue, 30 Jun 2026 03:21:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782814892; x=1783419692; 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=b11GVtladPRwtAnrqyMBKjVI7QEbzNXpHeXS1BWCw8Q=; b=hlya0Mu3D+kpZ96YhJ6NpcjOagXoHfGLumitpL8aq8bZyXG8GR4lLKEEM9UAVg0ESS qAwk9nH1UUZbI7V4VXL+uie7C8amuqpm/2U2KU480WpIzAPc5MjznN8V7jXXYmlHgsjs 6w/WnbyLYVfvzxu5SvuAAtMmdvXymsH8JnsfFtHlPN6fYOThlAoDscQDSg+izSmtaF8n NfeQWXiXaOem0kemW6lq2PLnXnnkpKwMvYhlSYMnm5MX2SYBboHy4zALgEq/mWV/G05v c+bIoutylIYVTD8LKL5NNxZd3M+v1PW3WVvY/CetxYiSiJaAbB001NvD5Wg2Q12RA1CF tIOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782814892; x=1783419692; 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=b11GVtladPRwtAnrqyMBKjVI7QEbzNXpHeXS1BWCw8Q=; b=Mea/TyCxy3O/xEm4FsvGKRx2wEx11wNsWc45CiF40fBgDU95HrStqouodqGnX3kvKi DT0Fnwy2vfrQbcqujwgtGsq1vM7i75kENJ2OXuZtAI7sERMuF4IU0YO2nqDpJi4sahbA VJQ5Urjp7gMEcWU9ZvVFiaYGjoYoHxi8qzEwFa8s5+HjCsRxiDl7jjk3JkSAlBwdAWtL Zyhy+5haA68w6rFQNObodZ9+PQ2WABg0+YMnTpxvJsnCcT9cKTP6RbXc9v191qSW9Onk x3tIpyAq9OZ7s8rs+UGjIOZGU+nqlMinJ9hOR533OKRcklqyEliLcoJBRDx4fgW7tmv5 CbzQ== X-Forwarded-Encrypted: i=1; AFNElJ83AbmVzkkNXQfp5dbjYcC4PiB4r3HP/rcHj/lY/vzovZS1aV1g07kGytUkRo5wUtZ/iXi2NCPowglnDXk=@vger.kernel.org X-Gm-Message-State: AOJu0YzuW5HGeyqnF8ZnHfXJpN3lvtcY58ueeaZ4eJASf7lkcG4s5j7M OpC0LEgA8mQrU6rRqrXEbaaX/gapSe75b1s2n83A9lf6H3Um67+lAVnGVvVuKA3RaOlYdwYKkDR ulbxSvpOLywdtIdCezwgvGYhSSC0PuA== X-Received: from wrbdt17.prod.google.com ([2002:a05:6000:d11:b0:470:f736:b5d4]) (user=sebastianene job=prod-delivery.src-stubby-dispatcher) by 2002:a7b:cd15:0:b0:493:bd4f:510 with SMTP id 5b1f17b1804b1-493bd4f0530mr3477925e9.19.1782814891385; Tue, 30 Jun 2026 03:21:31 -0700 (PDT) Date: Tue, 30 Jun 2026 10:20:59 +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-8-sebastianene@google.com> Subject: [PATCH v8 6/6] KVM: arm64: Zero out the stack initialized data in the FFA handler 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, Sashiko AI Content-Type: text/plain; charset="UTF-8" Don't leak hypervisor stack data when using the FFA_VERSION call. When the compiler doesn't support -ftrivial-auto-var-init=zero option we need to zero out the stack initialized variable before returning data to the host caller. Closes: https://lore.kernel.org/all/20260616160016.C62C81F000E9@smtp.kernel.org/ Reported-by: Sashiko AI Fixes: c9c012625e12 ("KVM: arm64: Trap FFA_VERSION host call in pKVM") Reviewed-by: Vincent Donnefort Link: https://lore.kernel.org/all/20260616160016.C62C81F000E9@smtp.kernel.org/ Signed-off-by: Sebastian Ene --- arch/arm64/kvm/hyp/nvhe/ffa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c index bb01d8f83056..7407bc4b547a 100644 --- a/arch/arm64/kvm/hyp/nvhe/ffa.c +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c @@ -881,7 +881,7 @@ static void do_ffa_part_get(struct arm_smccc_1_2_regs *res, bool kvm_host_ffa_handler(struct kvm_cpu_context *host_ctxt, u32 func_id) { - struct arm_smccc_1_2_regs res; + struct arm_smccc_1_2_regs res = {0}; /* * There's no way we can tell what a non-standard SMC call might -- 2.55.0.rc0.799.gd6f94ed593-goog