Paolo Bonzini
250715a617
KVM: x86: protect KVM_CREATE_PIT/KVM_CREATE_PIT2 with kvm->lock ...
The syzkaller folks reported a NULL pointer dereference that seems
to be cause by a race between KVM_CREATE_IRQCHIP and KVM_CREATE_PIT2.
The former takes kvm->lock (except when registering the devices,
which needs kvm->slots_lock); the latter takes kvm->slots_lock only.
Change KVM_CREATE_PIT2 to follow the same model as KVM_CREATE_IRQCHIP.
Testcase:
#include <pthread.h>
#include <linux/kvm.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include <stdint.h>
#include <string.h>
#include <stdlib.h>
#include <sys/syscall.h>
#include <unistd.h>
long r[23];
void* thr1(void* arg)
{
struct kvm_pit_config pitcfg = { .flags = 4 };
switch ((long)arg) {
case 0: r[2] = open("/dev/kvm", O_RDONLY|O_ASYNC); break;
case 1: r[3] = ioctl(r[2], KVM_CREATE_VM, 0); break;
case 2: r[4] = ioctl(r[3], KVM_CREATE_IRQCHIP, 0); break;
case 3: r[22] = ioctl(r[3], KVM_CREATE_PIT2, &pitcfg); break;
}
return 0;
}
int main(int argc, char **argv)
{
long i;
pthread_t th[4];
memset(r, -1, sizeof(r));
for (i = 0; i < 4; i++) {
pthread_create(&th[i], 0, thr, (void*)i);
if (argc > 1 && rand()%2) usleep(rand()%1000);
}
usleep(20000);
return 0;
}
Reported-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
2016-06-03 15:28:19 +02:00
2016-05-20 17:58:30 -07:00
2016-05-25 17:05:40 -07:00
2016-05-27 13:41:54 -07:00
2016-05-31 16:12:17 +02:00
2016-05-20 17:58:30 -07:00
2016-05-20 17:58:30 -07:00
2016-05-24 15:24:37 -07:00
2016-05-24 11:00:20 -07:00
2016-05-20 17:58:30 -07:00
2016-05-28 16:15:25 -07:00
2016-05-24 15:24:37 -07:00
2016-05-26 22:01:22 -07:00
2016-05-26 22:01:22 -07:00
2016-05-28 16:15:25 -07:00
2016-05-25 17:05:40 -07:00
2016-05-28 16:15:25 -07:00
2016-05-28 16:41:39 -07:00
2016-05-26 22:01:22 -07:00
2016-05-26 22:01:22 -07:00
2016-05-24 15:24:37 -07:00
2016-05-25 15:40:49 +02:00
2016-05-26 19:34:26 -07:00
2016-05-31 09:43:24 -07:00
2016-05-24 15:24:37 -07:00
2016-05-26 22:01:22 -07:00
2016-05-31 22:20:56 -07:00
2016-05-25 17:05:40 -07:00
2016-05-27 18:54:59 -07:00
2016-05-26 22:01:22 -07:00
2016-06-03 15:28:19 +02:00
2016-05-25 17:05:40 -07:00
2016-05-28 16:15:25 -07:00
250715a617