Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41b87599 authored by Mark Rutland's avatar Mark Rutland Committed by Will Deacon
Browse files

KVM: arm/arm64: vgic: fix possible spectre-v1 in vgic_get_irq() 



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

At the same time, sort the includes when adding <linux/nospec.h>.

Found by smatch.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Acked-by: default avatarChristoffer Dall <christoffer.dall@arm.com>
Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Cc: kvmarm@lists.cs.columbia.edu
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 19791a7c

virt/kvm/arm/vgic/vgic.c

+10 −4
Original line number Diff line number Diff line
@@ -14,11 +14,13 @@ 
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#include <linux/interrupt.h>

#include <linux/irq.h>

#include <linux/kvm.h>

#include <linux/kvm_host.h>

#include <linux/list_sort.h>

#include <linux/interrupt.h>

#include <linux/irq.h>

#include <linux/nospec.h>



#include <asm/kvm_hyp.h>



#include "vgic.h"
@@ -101,12 +103,16 @@ struct vgic_irq *vgic_get_irq(struct kvm *kvm, struct kvm_vcpu *vcpu, 
			      u32 intid)

{

	/* SGIs and PPIs */

	if (intid <= VGIC_MAX_PRIVATE)

	if (intid <= VGIC_MAX_PRIVATE) {

		intid = array_index_nospec(intid, VGIC_MAX_PRIVATE);

		return &vcpu->arch.vgic_cpu.private_irqs[intid];

	}



	/* SPIs */

	if (intid <= VGIC_MAX_SPI)

	if (intid <= VGIC_MAX_SPI) {

		intid = array_index_nospec(intid, VGIC_MAX_SPI);

		return &kvm->arch.vgic.spis[intid - VGIC_NR_PRIVATE_IRQS];

	}



	/* LPIs */

	if (intid >= VGIC_MIN_LPI)