From: Marc Zyngier <maz@kernel.org>
To: Will Deacon <will@kernel.org>
Cc: stable@vger.kernel.org, Vijaya Kumar K <vijaya.kumar@cavium.com>,
kernel-team@android.com, kvmarm@lists.cs.columbia.edu,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] KVM: arm64: Ensure 'params' is initialised when looking up sys register
Date: Thu, 12 Dec 2019 09:55:32 +0000 [thread overview]
Message-ID: <a4b931f697b2fc7ec6ef5356b84a3939@www.loen.fr> (raw)
In-Reply-To: <20191212094049.12437-1-will@kernel.org>
On 2019-12-12 09:40, Will Deacon wrote:
> Commit 4b927b94d5df ("KVM: arm/arm64: vgic: Introduce
> find_reg_by_id()")
> introduced 'find_reg_by_id()', which looks up a system register only
> if
> the 'id' index parameter identifies a valid system register. As part
> of
> the patch, existing callers of 'find_reg()' were ported over to the
> new
> interface, but this breaks 'index_to_sys_reg_desc()' in the case that
> the
> initial lookup in the vCPU target table fails because we will then
> call
> into 'find_reg()' for the system register table with an uninitialised
> 'param' as the key to the lookup.
>
> GCC 10 is bright enough to spot this (amongst a tonne of false
> positives,
> but hey!):
>
> | arch/arm64/kvm/sys_regs.c: In function
> ‘index_to_sys_reg_desc.part.0.isra’:
> | arch/arm64/kvm/sys_regs.c:983:33: warning: ‘params.Op2’ may be
> used uninitialized in this function [-Wmaybe-uninitialized]
> | 983 | (u32)(x)->CRn, (u32)(x)->CRm, (u32)(x)->Op2);
> | [...]
>
> Revert the hunk of 4b927b94d5df which breaks
> 'index_to_sys_reg_desc()' so
> that the old behaviour of checking the index upfront is restored.
Huhuh... Well spotted GCC 10! And thanks Will for the fix.
>
> Cc: <stable@vger.kernel.org>
> Cc: Marc Zyngier <maz@kernel.org>
> Cc: Vijaya Kumar K <Vijaya.Kumar@cavium.com>
> Fixes: 4b927b94d5df ("KVM: arm/arm64: vgic: Introduce
> find_reg_by_id()")
> Signed-off-by: Will Deacon <will@kernel.org>
> ---
> arch/arm64/kvm/sys_regs.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
> index 46822afc57e0..01a515e0171e 100644
> --- a/arch/arm64/kvm/sys_regs.c
> +++ b/arch/arm64/kvm/sys_regs.c
> @@ -2360,8 +2360,11 @@ static const struct sys_reg_desc
> *index_to_sys_reg_desc(struct kvm_vcpu *vcpu,
> if ((id & KVM_REG_ARM_COPROC_MASK) != KVM_REG_ARM64_SYSREG)
> return NULL;
>
> + if (!index_to_params(id, ¶ms))
> + return NULL;
> +
> table = get_target_table(vcpu->arch.target, true, &num);
> - r = find_reg_by_id(id, ¶ms, table, num);
> + r = find_reg(¶ms, table, num);
> if (!r)
> r = find_reg(¶ms, sys_reg_descs, ARRAY_SIZE(sys_reg_descs));
Applied, thanks.
M.
--
Jazz is not dead. It just smells funny...
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
prev parent reply other threads:[~2019-12-12 9:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-12 9:40 [PATCH] KVM: arm64: Ensure 'params' is initialised when looking up sys register Will Deacon
2019-12-12 9:55 ` Marc Zyngier [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a4b931f697b2fc7ec6ef5356b84a3939@www.loen.fr \
--to=maz@kernel.org \
--cc=kernel-team@android.com \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=stable@vger.kernel.org \
--cc=vijaya.kumar@cavium.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).