Commit 882f294a authored by Marios Pomonis's avatar Marios Pomonis Committed by Greg Kroah-Hartman

KVM: x86: Refactor picdev_write() to prevent Spectre-v1/L1TF attacks

commit 14e32321 upstream.

This fixes a Spectre-v1/L1TF vulnerability in picdev_write().
It replaces index computations based on the (attacked-controlled) port
number with constants through a minor refactoring.

Fixes: 85f455f7 ("KVM: Add support for in-kernel PIC emulation")
Signed-off-by: default avatarNick Finco <nifi@google.com>
Signed-off-by: default avatarMarios Pomonis <pomonis@google.com>
Reviewed-by: default avatarAndrew Honig <ahonig@google.com>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarJim Mattson <jmattson@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d062d982
...@@ -460,10 +460,14 @@ static int picdev_write(struct kvm_pic *s, ...@@ -460,10 +460,14 @@ static int picdev_write(struct kvm_pic *s,
switch (addr) { switch (addr) {
case 0x20: case 0x20:
case 0x21: case 0x21:
pic_lock(s);
pic_ioport_write(&s->pics[0], addr, data);
pic_unlock(s);
break;
case 0xa0: case 0xa0:
case 0xa1: case 0xa1:
pic_lock(s); pic_lock(s);
pic_ioport_write(&s->pics[addr >> 7], addr, data); pic_ioport_write(&s->pics[1], addr, data);
pic_unlock(s); pic_unlock(s);
break; break;
case 0x4d0: case 0x4d0:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment