From: Anshuman Khandual <anshuman.khandual@arm.com>
To: Ilkka Koskinen <ilkka@os.amperecomputing.com>,
Gavin Shan <gshan@redhat.com>, Marc Zyngier <maz@kernel.org>,
Oliver Upton <oliver.upton@linux.dev>,
Joey Gouly <joey.gouly@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Zenghui Yu <yuzenghui@huawei.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
Akihiko Odaki <akihiko.odaki@daynix.com>
Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] KVM: arm64: Fix shift-out-of-bounds bug
Date: Thu, 17 Oct 2024 13:09:29 +0530 [thread overview]
Message-ID: <3bf1390c-3823-43cd-8b5c-9b0848450628@arm.com> (raw)
In-Reply-To: <20241017025701.67936-1-ilkka@os.amperecomputing.com>
On 10/17/24 08:27, Ilkka Koskinen wrote:
> Fix a shift-out-of-bounds bug reported by UBSAN when running
> VM with MTE enabled host kernel.
>
> UBSAN: shift-out-of-bounds in arch/arm64/kvm/sys_regs.c:1988:14
> shift exponent 33 is too large for 32-bit type 'int'
> CPU: 26 UID: 0 PID: 7629 Comm: qemu-kvm Not tainted 6.12.0-rc2 #34
> Hardware name: IEI NF5280R7/Mitchell MB, BIOS 00.00. 2024-10-12 09:28:54 10/14/2024
> Call trace:
> dump_backtrace+0xa0/0x128
> show_stack+0x20/0x38
> dump_stack_lvl+0x74/0x90
> dump_stack+0x18/0x28
> __ubsan_handle_shift_out_of_bounds+0xf8/0x1e0
> reset_clidr+0x10c/0x1c8
> kvm_reset_sys_regs+0x50/0x1c8
> kvm_reset_vcpu+0xec/0x2b0
> __kvm_vcpu_set_target+0x84/0x158
> kvm_vcpu_set_target+0x138/0x168
> kvm_arch_vcpu_ioctl_vcpu_init+0x40/0x2b0
> kvm_arch_vcpu_ioctl+0x28c/0x4b8
> kvm_vcpu_ioctl+0x4bc/0x7a8
> __arm64_sys_ioctl+0xb4/0x100
> invoke_syscall+0x70/0x100
> el0_svc_common.constprop.0+0x48/0xf0
> do_el0_svc+0x24/0x38
> el0_svc+0x3c/0x158
> el0t_64_sync_handler+0x120/0x130
> el0t_64_sync+0x194/0x198
>
> Fixes: 7af0c2534f4c ("KVM: arm64: Normalize cache configuration")
> Cc: stable@vger.kernel.org
> Reviewed-by: Gavin Shan <gshan@redhat.com>
> Signed-off-by: Ilkka Koskinen <ilkka@os.amperecomputing.com>
> ---
> arch/arm64/kvm/sys_regs.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
> index 375052d8cd22..ff8c4e1b847e 100644
> --- a/arch/arm64/kvm/sys_regs.c
> +++ b/arch/arm64/kvm/sys_regs.c
> @@ -1994,7 +1994,7 @@ static u64 reset_clidr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r)
> * one cache line.
> */
> if (kvm_has_mte(vcpu->kvm))
> - clidr |= 2 << CLIDR_TTYPE_SHIFT(loc);
> + clidr |= 2ULL << CLIDR_TTYPE_SHIFT(loc);
>
> __vcpu_sys_reg(vcpu, r->reg) = clidr;
>
clidr being u64, 2ULL is preferred over 2UL.
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
next prev parent reply other threads:[~2024-10-17 7:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-17 2:57 Ilkka Koskinen
2024-10-17 7:39 ` Anshuman Khandual [this message]
2024-10-17 8:23 ` Marc Zyngier
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=3bf1390c-3823-43cd-8b5c-9b0848450628@arm.com \
--to=anshuman.khandual@arm.com \
--cc=akihiko.odaki@daynix.com \
--cc=catalin.marinas@arm.com \
--cc=gshan@redhat.com \
--cc=ilkka@os.amperecomputing.com \
--cc=joey.gouly@arm.com \
--cc=kvmarm@lists.linux.dev \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maz@kernel.org \
--cc=oliver.upton@linux.dev \
--cc=suzuki.poulose@arm.com \
--cc=will@kernel.org \
--cc=yuzenghui@huawei.com \
/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
all inboxes | Powered by JetHome®