redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

um: virtio_uml: Disallow modular build 

commit bf9f80cf0c upstream.

This driver *can* be a module, but then its parameters (socket path)
are untrusted data from inside the VM, and that isn't allowed. Allow
the code to only be built-in to avoid that.

Fixes: 5d38f32499 ("um: drivers: Add virtio vhost-user driver")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Acked-by: Anton Ivanov <anton.ivanov@cambridgegreys.co.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
5.4-rM2-2.2.x-imx-squashed
Johannes Berg 2019-10-08 17:43:21 +02:00 committed by Greg Kroah-Hartman
parent 0efee942c6
commit d8cdfd9bc1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/um/drivers/Kconfig
View File

@ -337,7 +337,7 @@ config UML_NET_SLIRP
endmenu endmenu
config VIRTIO_UML config VIRTIO_UML
tristate "UML driver for virtio devices" bool "UML driver for virtio devices"
select VIRTIO select VIRTIO
help help
This driver provides support for virtio based paravirtual device This driver provides support for virtio based paravirtual device

4
arch/um/drivers/virtio_uml.c
View File

@ -4,12 +4,12 @@
* *
* Copyright(c) 2019 Intel Corporation * Copyright(c) 2019 Intel Corporation
* *
* This module allows virtio devices to be used over a vhost-user socket. * This driver allows virtio devices to be used over a vhost-user socket.
* *
* Guest devices can be instantiated by kernel module or command line * Guest devices can be instantiated by kernel module or command line
* parameters. One device will be created for each parameter. Syntax: * parameters. One device will be created for each parameter. Syntax:
* *
* [virtio_uml.]device=<socket>:<virtio_id>[:<platform_id>] * virtio_uml.device=<socket>:<virtio_id>[:<platform_id>]
* where: * where:
* <socket> := vhost-user socket path to connect * <socket> := vhost-user socket path to connect
* <virtio_id> := virtio device id (as in virtio_ids.h) * <virtio_id> := virtio device id (as in virtio_ids.h)