]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
KVM: arm/arm64: vgic: fix possible spectre-v1 in vgic_mmio_read_apr()
authorMark Rutland <mark.rutland@arm.com>
Wed, 25 Apr 2018 16:13:42 +0000 (17:13 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 Jun 2018 19:01:27 +0000 (04:01 +0900)
commit56b6ae130149f9108ecff7701e1fde1532e6a4b4
tree2b845ad6ccb6f0c285989608c8095ad31f7ebbde
parent1f22c288b9d833d6c04f9adacf5a03b03d3d1484
KVM: arm/arm64: vgic: fix possible spectre-v1 in vgic_mmio_read_apr()

[ Upstream commit 5e1ca5e23b167987d5b6d8b08f2d5b7dd2d13f49 ]

It's possible for userspace to control n. Sanitize n when using it as an
array index.

Note that while it appears that n must be bound to the interval [0,3]
due to the way it is extracted from addr, we cannot guarantee that
compiler transformations (and/or future refactoring) will ensure this is
the case, and given this is a slow path it's better to always perform
the masking.

Found by smatch.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Christoffer Dall <christoffer.dall@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: kvmarm@lists.cs.columbia.edu
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
virt/kvm/arm/vgic/vgic-mmio-v2.c