Skip to contentSkip to conversation

media: add virtio-media driver

PATCH Superseded Brian Daniels 2 participants 13 messages Nov 20

Subsystems (3)

v11 of 12 Superseded Latest is v12 →

lore
Share & tools
lore
#0 lore raw

v11 cover media: add virtio-media driver

From: Alexandre Courbot <[email protected]>

Add the first version of the virtio-media driver.

This driver acts roughly as a V4L2 relay between user-space and the virtio virtual device on the host, so it is relatively simple, yet unconventional. It doesn't use VB2 or other frameworks typically used in a V4L2 driver, and most of its complexity resides in correctly and efficiently building the virtio descriptor chain to pass to the host, avoiding copies whenever possible. This is done by scatterlist_builder.[ch].

This version supports MMAP buffers. DMABUF support is still pending.
---
Guest Setup

Tests were ran on a Debian 12 guest running with crosvm. The guest image was created with:

$ virt-builder debian-12 --root-password password:""

Build crosvm and launch the guest starting at the "Crosvm" section on this page: https://github.com/chromeos/virtio-media/blob/main/TRY_IT_OUT.md#crosvm

NOTE: Before running v4l2-compliance in the guest, you need to install v4l-utils and ffmpeg:

$ apt update && apt install v4l-utils ffmpeg

---
Compliance Testing

This was tested using v4l2-compliance. Since virtio-media serves as a proxy to host devices for the guest VMs, we expect the guest compliance test to essentially match the host compliance test for the same device.

NOTE: A single failure is fixed when v4l2-compliance is ran on the guest by patching the v4l2r crate used by crosvm. The patch I used hasn't been merged but is available here: https://github.com/Gnurou/v4l2r/pull/66.

All tests used a Logitech USB Webcam C925e.

As tested on the host:

$ v4l2-compliance -d0 -s

v4l2-compliance 1.33.0-5523, 64 bits, 64-bit time_t v4l2-compliance SHA: 7e25bb929095 2026-10-29 15:02:40

Compliance test for uvcvideo device /dev/video0:

Driver Info:

	Driver name      : uvcvideo
	Card type        : Logitech Webcam C925e
	Bus info         : usb-0000:04:00.1-3
	Driver version   : 7.1.6
	Capabilities     : 0x84a00001

Video Capture
Metadata Capture
Streaming
Extended Pix Format
Device Capabilities
Device Caps : 0x04200001
Video Capture
Streaming
Extended Pix Format
Media Driver Info:

	Driver name      : uvcvideo
	Model            : Logitech Webcam C925e
	Serial           : 686F371F
	Bus info         : usb-0000:04:00.1-3
	Media version    : 7.1.6
	Hardware revision: 0x00000016 (22)
	Driver version   : 7.1.6
Interface Info:
	ID               : 0x03000002
	Type             : V4L Video
Entity Info:
	ID               : 0x00000001 (1)
	Name             : Logitech Webcam C925e
	Function         : V4L2 I/O
	Flags            : default
	Pad 0x01000007   : 0: Sink
	  Link 0x0200001f: from remote pad 0x100000a of entity 'Processing 3' (Video Pixel Formatter): Data, Enabled, Immutable

Required ioctls:
test MC information (see 'Media Driver Info' above): OK test VIDIOC_QUERYCAP: OK
test invalid ioctls: OK

Allow for multiple opens:
test second /dev/video0 open: OK
test VIDIOC_QUERYCAP: OK
test VIDIOC_G/S_PRIORITY: OK
test for unlimited opens: OK

Debug ioctls:
test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported) test VIDIOC_LOG_STATUS: OK (Not Supported)

Input ioctls:
test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported) test VIDIOC_ENUMAUDIO: OK (Not Supported)
test VIDIOC_G/S/ENUMINPUT: OK
test VIDIOC_G/S_AUDIO: OK (Not Supported)
Inputs: 1 Audio Inputs: 0 Tuners: 0

Output ioctls:
test VIDIOC_G/S_MODULATOR: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_ENUMAUDOUT: OK (Not Supported) test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported) test VIDIOC_G/S_AUDOUT: OK (Not Supported)
Outputs: 0 Audio Outputs: 0 Modulators: 0

Input/Output configuration ioctls:
test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported) test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported) test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported) test VIDIOC_G/S_EDID: OK (Not Supported)

Control ioctls (Input 0):
test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK test VIDIOC_QUERYCTRL: OK
test VIDIOC_G/S_CTRL: OK
test VIDIOC_G/S/TRY_EXT_CTRLS: OK test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 19 Private Controls: 0

Format ioctls (Input 0):
test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK test VIDIOC_G/S_PARM: OK
test VIDIOC_G_FBUF: OK (Not Supported) test VIDIOC_G_FMT: OK
test VIDIOC_TRY_FMT: OK
test VIDIOC_S_FMT: OK
test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported) test Cropping: OK (Not Supported)
test Composing: OK (Not Supported)
test Scaling: OK (Not Supported)

Codec ioctls (Input 0):
test VIDIOC_(TRY_)ENCODER_CMD: OK (Not Supported) test VIDIOC_G_ENC_INDEX: OK (Not Supported) test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported)

Buffer ioctls (Input 0):
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK test CREATE_BUFS maximum buffers: OK test VIDIOC_REMOVE_BUFS: OK
test VIDIOC_EXPBUF: OK
test Requests: OK (Not Supported) test blocking wait: OK

Test input 0:

Streaming ioctls:
test read/write: OK (Not Supported)

Video Capture: Frame #000
Video Capture: Frame #001
Video Capture: Frame #002
Video Capture: Frame #003
Video Capture: Frame #004
Video Capture: Frame #005
Video Capture: Frame #006
Video Capture: Frame #007
Video Capture: Frame #008
Video Capture: Frame #009
Video Capture: Frame #010
Video Capture: Frame #011
Video Capture: Frame #012
Video Capture: Frame #013
Video Capture: Frame #014
Video Capture: Frame #015
Video Capture: Frame #016
Video Capture: Frame #017
Video Capture: Frame #018
Video Capture: Frame #019
Video Capture: Frame #020
Video Capture: Frame #021
Video Capture: Frame #022
Video Capture: Frame #023
Video Capture: Frame #024
Video Capture: Frame #025
Video Capture: Frame #026
Video Capture: Frame #027
Video Capture: Frame #028
Video Capture: Frame #029
Video Capture: Frame #030
Video Capture: Frame #031
Video Capture: Frame #032
Video Capture: Frame #033
Video Capture: Frame #034
Video Capture: Frame #035
Video Capture: Frame #036
Video Capture: Frame #037
Video Capture: Frame #038
Video Capture: Frame #039
Video Capture: Frame #040
Video Capture: Frame #041
Video Capture: Frame #042
Video Capture: Frame #043
Video Capture: Frame #044
Video Capture: Frame #045
Video Capture: Frame #046
Video Capture: Frame #047
Video Capture: Frame #048
Video Capture: Frame #049
Video Capture: Frame #050
Video Capture: Frame #051
Video Capture: Frame #052
Video Capture: Frame #053
Video Capture: Frame #054
Video Capture: Frame #055
Video Capture: Frame #056
Video Capture: Frame #057
Video Capture: Frame #058
Video Capture: Frame #059

test MMAP (no poll, REQBUFS): OK

Video Capture: Frame #000 (select)
Video Capture: Frame #001 (select)
Video Capture: Frame #002 (select)
Video Capture: Frame #003 (select)
Video Capture: Frame #004 (select)
Video Capture: Frame #005 (select)
Video Capture: Frame #006 (select)
Video Capture: Frame #007 (select)
Video Capture: Frame #008 (select)
Video Capture: Frame #009 (select)
Video Capture: Frame #010 (select)
Video Capture: Frame #011 (select)
Video Capture: Frame #012 (select)
Video Capture: Frame #013 (select)
Video Capture: Frame #014 (select)
Video Capture: Frame #015 (select)
Video Capture: Frame #016 (select)
Video Capture: Frame #017 (select)
Video Capture: Frame #018 (select)
Video Capture: Frame #019 (select)
Video Capture: Frame #020 (select)
Video Capture: Frame #021 (select)
Video Capture: Frame #022 (select)
Video Capture: Frame #023 (select)
Video Capture: Frame #024 (select)
Video Capture: Frame #025 (select)
Video Capture: Frame #026 (select)
Video Capture: Frame #027 (select)
Video Capture: Frame #028 (select)
Video Capture: Frame #029 (select)
Video Capture: Frame #030 (select)
Video Capture: Frame #031 (select)
Video Capture: Frame #032 (select)
Video Capture: Frame #033 (select)
Video Capture: Frame #034 (select)
Video Capture: Frame #035 (select)
Video Capture: Frame #036 (select)
Video Capture: Frame #037 (select)
Video Capture: Frame #038 (select)
Video Capture: Frame #039 (select)
Video Capture: Frame #040 (select)
Video Capture: Frame #041 (select)
Video Capture: Frame #042 (select)
Video Capture: Frame #043 (select)
Video Capture: Frame #044 (select)
Video Capture: Frame #045 (select)
Video Capture: Frame #046 (select)
Video Capture: Frame #047 (select)
Video Capture: Frame #048 (select)
Video Capture: Frame #049 (select)
Video Capture: Frame #050 (select)
Video Capture: Frame #051 (select)
Video Capture: Frame #052 (select)
Video Capture: Frame #053 (select)
Video Capture: Frame #054 (select)
Video Capture: Frame #055 (select)
Video Capture: Frame #056 (select)
Video Capture: Frame #057 (select)
Video Capture: Frame #058 (select)
Video Capture: Frame #059 (select)

test MMAP (select, REQBUFS): OK

Video Capture: Frame #000 (epoll)
Video Capture: Frame #001 (epoll)
Video Capture: Frame #002 (epoll)
Video Capture: Frame #003 (epoll)
Video Capture: Frame #004 (epoll)
Video Capture: Frame #005 (epoll)
Video Capture: Frame #006 (epoll)
Video Capture: Frame #007 (epoll)
Video Capture: Frame #008 (epoll)
Video Capture: Frame #009 (epoll)
Video Capture: Frame #010 (epoll)
Video Capture: Frame #011 (epoll)
Video Capture: Frame #012 (epoll)
Video Capture: Frame #013 (epoll)
Video Capture: Frame #014 (epoll)
Video Capture: Frame #015 (epoll)
Video Capture: Frame #016 (epoll)
Video Capture: Frame #017 (epoll)
Video Capture: Frame #018 (epoll)
Video Capture: Frame #019 (epoll)
Video Capture: Frame #020 (epoll)
Video Capture: Frame #021 (epoll)
Video Capture: Frame #022 (epoll)
Video Capture: Frame #023 (epoll)
Video Capture: Frame #024 (epoll)
Video Capture: Frame #025 (epoll)
Video Capture: Frame #026 (epoll)
Video Capture: Frame #027 (epoll)
Video Capture: Frame #028 (epoll)
Video Capture: Frame #029 (epoll)
Video Capture: Frame #030 (epoll)
Video Capture: Frame #031 (epoll)
Video Capture: Frame #032 (epoll)
Video Capture: Frame #033 (epoll)
Video Capture: Frame #034 (epoll)
Video Capture: Frame #035 (epoll)
Video Capture: Frame #036 (epoll)
Video Capture: Frame #037 (epoll)
Video Capture: Frame #038 (epoll)
Video Capture: Frame #039 (epoll)
Video Capture: Frame #040 (epoll)
Video Capture: Frame #041 (epoll)
Video Capture: Frame #042 (epoll)
Video Capture: Frame #043 (epoll)
Video Capture: Frame #044 (epoll)
Video Capture: Frame #045 (epoll)
Video Capture: Frame #046 (epoll)
Video Capture: Frame #047 (epoll)
Video Capture: Frame #048 (epoll)
Video Capture: Frame #049 (epoll)
Video Capture: Frame #050 (epoll)
Video Capture: Frame #051 (epoll)
Video Capture: Frame #052 (epoll)
Video Capture: Frame #053 (epoll)
Video Capture: Frame #054 (epoll)
Video Capture: Frame #055 (epoll)
Video Capture: Frame #056 (epoll)
Video Capture: Frame #057 (epoll)
Video Capture: Frame #058 (epoll)
Video Capture: Frame #059 (epoll)

test MMAP (epoll, REQBUFS): OK

Video Capture: Frame #000
Video Capture: Frame #001
Video Capture: Frame #002
Video Capture: Frame #003
Video Capture: Frame #004
Video Capture: Frame #005
Video Capture: Frame #006
Video Capture: Frame #007
Video Capture: Frame #008
Video Capture: Frame #009
Video Capture: Frame #010
Video Capture: Frame #011
Video Capture: Frame #012
Video Capture: Frame #013
Video Capture: Frame #014
Video Capture: Frame #015
Video Capture: Frame #016
Video Capture: Frame #017
Video Capture: Frame #018
Video Capture: Frame #019
Video Capture: Frame #020
Video Capture: Frame #021
Video Capture: Frame #022
Video Capture: Frame #023
Video Capture: Frame #024
Video Capture: Frame #025
Video Capture: Frame #026
Video Capture: Frame #027
Video Capture: Frame #028
Video Capture: Frame #029
Video Capture: Frame #030
Video Capture: Frame #031
Video Capture: Frame #032
Video Capture: Frame #033
Video Capture: Frame #034
Video Capture: Frame #035
Video Capture: Frame #036
Video Capture: Frame #037
Video Capture: Frame #038
Video Capture: Frame #039
Video Capture: Frame #040
Video Capture: Frame #041
Video Capture: Frame #042
Video Capture: Frame #043
Video Capture: Frame #044
Video Capture: Frame #045
Video Capture: Frame #046
Video Capture: Frame #047
Video Capture: Frame #048
Video Capture: Frame #049
Video Capture: Frame #050
Video Capture: Frame #051
Video Capture: Frame #052
Video Capture: Frame #053
Video Capture: Frame #054
Video Capture: Frame #055
Video Capture: Frame #056
Video Capture: Frame #057
Video Capture: Frame #058
Video Capture: Frame #059

test MMAP (no poll, CREATE_BUFS): OK

Video Capture: Frame #000 (select)
Video Capture: Frame #001 (select)
Video Capture: Frame #002 (select)
Video Capture: Frame #003 (select)
Video Capture: Frame #004 (select)
Video Capture: Frame #005 (select)
Video Capture: Frame #006 (select)
Video Capture: Frame #007 (select)
Video Capture: Frame #008 (select)
Video Capture: Frame #009 (select)
Video Capture: Frame #010 (select)
Video Capture: Frame #011 (select)
Video Capture: Frame #012 (select)
Video Capture: Frame #013 (select)
Video Capture: Frame #014 (select)
Video Capture: Frame #015 (select)
Video Capture: Frame #016 (select)
Video Capture: Frame #017 (select)
Video Capture: Frame #018 (select)
Video Capture: Frame #019 (select)
Video Capture: Frame #020 (select)
Video Capture: Frame #021 (select)
Video Capture: Frame #022 (select)
Video Capture: Frame #023 (select)
Video Capture: Frame #024 (select)
Video Capture: Frame #025 (select)
Video Capture: Frame #026 (select)
Video Capture: Frame #027 (select)
Video Capture: Frame #028 (select)
Video Capture: Frame #029 (select)
Video Capture: Frame #030 (select)
Video Capture: Frame #031 (select)
Video Capture: Frame #032 (select)
Video Capture: Frame #033 (select)
Video Capture: Frame #034 (select)
Video Capture: Frame #035 (select)
Video Capture: Frame #036 (select)
Video Capture: Frame #037 (select)
Video Capture: Frame #038 (select)
Video Capture: Frame #039 (select)
Video Capture: Frame #040 (select)
Video Capture: Frame #041 (select)
Video Capture: Frame #042 (select)
Video Capture: Frame #043 (select)
Video Capture: Frame #044 (select)
Video Capture: Frame #045 (select)
Video Capture: Frame #046 (select)
Video Capture: Frame #047 (select)
Video Capture: Frame #048 (select)
Video Capture: Frame #049 (select)
Video Capture: Frame #050 (select)
Video Capture: Frame #051 (select)
Video Capture: Frame #052 (select)
Video Capture: Frame #053 (select)
Video Capture: Frame #054 (select)
Video Capture: Frame #055 (select)
Video Capture: Frame #056 (select)
Video Capture: Frame #057 (select)
Video Capture: Frame #058 (select)
Video Capture: Frame #059 (select)

test MMAP (select, CREATE_BUFS): OK

Video Capture: Frame #000 (epoll)
Video Capture: Frame #001 (epoll)
Video Capture: Frame #002 (epoll)
Video Capture: Frame #003 (epoll)
Video Capture: Frame #004 (epoll)
Video Capture: Frame #005 (epoll)
Video Capture: Frame #006 (epoll)
Video Capture: Frame #007 (epoll)
Video Capture: Frame #008 (epoll)
Video Capture: Frame #009 (epoll)
Video Capture: Frame #010 (epoll)
Video Capture: Frame #011 (epoll)
Video Capture: Frame #012 (epoll)
Video Capture: Frame #013 (epoll)
Video Capture: Frame #014 (epoll)
Video Capture: Frame #015 (epoll)
Video Capture: Frame #016 (epoll)
Video Capture: Frame #017 (epoll)
Video Capture: Frame #018 (epoll)
Video Capture: Frame #019 (epoll)
Video Capture: Frame #020 (epoll)
Video Capture: Frame #021 (epoll)
Video Capture: Frame #022 (epoll)
Video Capture: Frame #023 (epoll)
Video Capture: Frame #024 (epoll)
Video Capture: Frame #025 (epoll)
Video Capture: Frame #026 (epoll)
Video Capture: Frame #027 (epoll)
Video Capture: Frame #028 (epoll)
Video Capture: Frame #029 (epoll)
Video Capture: Frame #030 (epoll)
Video Capture: Frame #031 (epoll)
Video Capture: Frame #032 (epoll)
Video Capture: Frame #033 (epoll)
Video Capture: Frame #034 (epoll)
Video Capture: Frame #035 (epoll)
Video Capture: Frame #036 (epoll)
Video Capture: Frame #037 (epoll)
Video Capture: Frame #038 (epoll)
Video Capture: Frame #039 (epoll)
Video Capture: Frame #040 (epoll)
Video Capture: Frame #041 (epoll)
Video Capture: Frame #042 (epoll)
Video Capture: Frame #043 (epoll)
Video Capture: Frame #044 (epoll)
Video Capture: Frame #045 (epoll)
Video Capture: Frame #046 (epoll)
Video Capture: Frame #047 (epoll)
Video Capture: Frame #048 (epoll)
Video Capture: Frame #049 (epoll)
Video Capture: Frame #050 (epoll)
Video Capture: Frame #051 (epoll)
Video Capture: Frame #052 (epoll)
Video Capture: Frame #053 (epoll)
Video Capture: Frame #054 (epoll)
Video Capture: Frame #055 (epoll)
Video Capture: Frame #056 (epoll)
Video Capture: Frame #057 (epoll)
Video Capture: Frame #058 (epoll)
Video Capture: Frame #059 (epoll)

test MMAP (epoll, CREATE_BUFS): OK

Video Capture: Frame #000
Video Capture: Frame #001
Video Capture: Frame #002
Video Capture: Frame #003
Video Capture: Frame #004
Video Capture: Frame #005
Video Capture: Frame #006
Video Capture: Frame #007
Video Capture: Frame #008
Video Capture: Frame #009
Video Capture: Frame #010
Video Capture: Frame #011
Video Capture: Frame #012
Video Capture: Frame #013
Video Capture: Frame #014
Video Capture: Frame #015
Video Capture: Frame #016
Video Capture: Frame #017
Video Capture: Frame #018
Video Capture: Frame #019
Video Capture: Frame #020
Video Capture: Frame #021
Video Capture: Frame #022
Video Capture: Frame #023
Video Capture: Frame #024
Video Capture: Frame #025
Video Capture: Frame #026
Video Capture: Frame #027
Video Capture: Frame #028
Video Capture: Frame #029
Video Capture: Frame #030
Video Capture: Frame #031
Video Capture: Frame #032
Video Capture: Frame #033
Video Capture: Frame #034
Video Capture: Frame #035
Video Capture: Frame #036
Video Capture: Frame #037
Video Capture: Frame #038
Video Capture: Frame #039
Video Capture: Frame #040
Video Capture: Frame #041
Video Capture: Frame #042
Video Capture: Frame #043
Video Capture: Frame #044
Video Capture: Frame #045
Video Capture: Frame #046
Video Capture: Frame #047
Video Capture: Frame #048
Video Capture: Frame #049
Video Capture: Frame #050
Video Capture: Frame #051
Video Capture: Frame #052
Video Capture: Frame #053
Video Capture: Frame #054
Video Capture: Frame #055
Video Capture: Frame #056
Video Capture: Frame #057
Video Capture: Frame #058
Video Capture: Frame #059

test USERPTR (no poll): OK

Video Capture: Frame #000 (select)
Video Capture: Frame #001 (select)
Video Capture: Frame #002 (select)
Video Capture: Frame #003 (select)
Video Capture: Frame #004 (select)
Video Capture: Frame #005 (select)
Video Capture: Frame #006 (select)
Video Capture: Frame #007 (select)
Video Capture: Frame #008 (select)
Video Capture: Frame #009 (select)
Video Capture: Frame #010 (select)
Video Capture: Frame #011 (select)
Video Capture: Frame #012 (select)
Video Capture: Frame #013 (select)
Video Capture: Frame #014 (select)
Video Capture: Frame #015 (select)
Video Capture: Frame #016 (select)
Video Capture: Frame #017 (select)
Video Capture: Frame #018 (select)
Video Capture: Frame #019 (select)
Video Capture: Frame #020 (select)
Video Capture: Frame #021 (select)
Video Capture: Frame #022 (select)
Video Capture: Frame #023 (select)
Video Capture: Frame #024 (select)
Video Capture: Frame #025 (select)
Video Capture: Frame #026 (select)
Video Capture: Frame #027 (select)
Video Capture: Frame #028 (select)
Video Capture: Frame #029 (select)
Video Capture: Frame #030 (select)
Video Capture: Frame #031 (select)
Video Capture: Frame #032 (select)
Video Capture: Frame #033 (select)
Video Capture: Frame #034 (select)
Video Capture: Frame #035 (select)
Video Capture: Frame #036 (select)
Video Capture: Frame #037 (select)
Video Capture: Frame #038 (select)
Video Capture: Frame #039 (select)
Video Capture: Frame #040 (select)
Video Capture: Frame #041 (select)
Video Capture: Frame #042 (select)
Video Capture: Frame #043 (select)
Video Capture: Frame #044 (select)
Video Capture: Frame #045 (select)
Video Capture: Frame #046 (select)
Video Capture: Frame #047 (select)
Video Capture: Frame #048 (select)
Video Capture: Frame #049 (select)
Video Capture: Frame #050 (select)
Video Capture: Frame #051 (select)
Video Capture: Frame #052 (select)
Video Capture: Frame #053 (select)
Video Capture: Frame #054 (select)
Video Capture: Frame #055 (select)
Video Capture: Frame #056 (select)
Video Capture: Frame #057 (select)
Video Capture: Frame #058 (select)
Video Capture: Frame #059 (select)

test USERPTR (select): OK
warn: v4l2-test-buffers.cpp(2220): Cannot test DMABUF, specify --expbuf-device
test DMABUF (no poll): OK (Not Supported)
test DMABUF (select): OK (Not Supported)

Total for uvcvideo device /dev/video0: 60, Succeeded: 60, Failed: 0, Warnings: 1

As tested on the guest:

$ v4l2-compliance -d0 -s --is-uvc

v4l2-compliance 1.33.0-5523, 64 bits, 64-bit time_t v4l2-compliance SHA: b3a7e9f866ed 2026-10-29 15:25:03

Compliance test for virtio-media device /dev/video0:

Driver Info:

	Driver name      : virtio-media
	Card type        : Logitech Webcam C925e
	Bus info         : platform:virtio-media
	Driver version   : 7.3.0
	Capabilities     : 0x84200001

Video Capture
Streaming
Extended Pix Format
Device Capabilities
Device Caps : 0x04200001
Video Capture
Streaming
Extended Pix Format

Required ioctls:
test VIDIOC_QUERYCAP: OK
test invalid ioctls: OK

Allow for multiple opens:
test second /dev/video0 open: OK
test VIDIOC_QUERYCAP: OK
test VIDIOC_G/S_PRIORITY: OK
test for unlimited opens: OK

Debug ioctls:
test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported) test VIDIOC_LOG_STATUS: OK (Not Supported)

Input ioctls:
test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_S_HW_FREQ_SEEK: OK
test VIDIOC_ENUMAUDIO: OK (Not Supported)
test VIDIOC_G/S/ENUMINPUT: OK
test VIDIOC_G/S_AUDIO: OK (Not Supported)
Inputs: 1 Audio Inputs: 0 Tuners: 0

Output ioctls:
test VIDIOC_G/S_MODULATOR: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_ENUMAUDOUT: OK (Not Supported) test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported) test VIDIOC_G/S_AUDOUT: OK (Not Supported)
Outputs: 0 Audio Outputs: 0 Modulators: 0

Input/Output configuration ioctls:
test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported) test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported) test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported) test VIDIOC_G/S_EDID: OK (Not Supported)

Control ioctls (Input 0):
test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK test VIDIOC_QUERYCTRL: OK
test VIDIOC_G/S_CTRL: OK
test VIDIOC_G/S/TRY_EXT_CTRLS: OK test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 19 Private Controls: 0

Format ioctls (Input 0):
test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK test VIDIOC_G/S_PARM: OK
test VIDIOC_G_FBUF: OK (Not Supported) test VIDIOC_G_FMT: OK
test VIDIOC_TRY_FMT: OK
test VIDIOC_S_FMT: OK
test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported) test Cropping: OK (Not Supported)
test Composing: OK (Not Supported)
test Scaling: OK (Not Supported)

Codec ioctls (Input 0):
test VIDIOC_(TRY_)ENCODER_CMD: OK (Not Supported) test VIDIOC_G_ENC_INDEX: OK (Not Supported) test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported)

Buffer ioctls (Input 0):
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK test CREATE_BUFS maximum buffers: OK test VIDIOC_REMOVE_BUFS: OK
test VIDIOC_EXPBUF: OK (Not Supported) test Requests: OK (Not Supported) test blocking wait: OK

Test input 0:

Streaming ioctls:
test read/write: OK (Not Supported)

Video Capture: Frame #000
Video Capture: Frame #001
Video Capture: Frame #002
Video Capture: Frame #003
Video Capture: Frame #004
Video Capture: Frame #005
Video Capture: Frame #006
Video Capture: Frame #007
Video Capture: Frame #008
Video Capture: Frame #009
Video Capture: Frame #010
Video Capture: Frame #011
Video Capture: Frame #012
Video Capture: Frame #013
Video Capture: Frame #014
Video Capture: Frame #015
Video Capture: Frame #016
Video Capture: Frame #017
Video Capture: Frame #018
Video Capture: Frame #019
Video Capture: Frame #020
Video Capture: Frame #021
Video Capture: Frame #022
Video Capture: Frame #023
Video Capture: Frame #024
Video Capture: Frame #025
Video Capture: Frame #026
Video Capture: Frame #027
Video Capture: Frame #028
Video Capture: Frame #029
Video Capture: Frame #030
Video Capture: Frame #031
Video Capture: Frame #032
Video Capture: Frame #033
Video Capture: Frame #034
Video Capture: Frame #035
Video Capture: Frame #036
Video Capture: Frame #037
Video Capture: Frame #038
Video Capture: Frame #039
Video Capture: Frame #040
Video Capture: Frame #041
Video Capture: Frame #042
Video Capture: Frame #043
Video Capture: Frame #044
Video Capture: Frame #045
Video Capture: Frame #046
Video Capture: Frame #047
Video Capture: Frame #048
Video Capture: Frame #049
Video Capture: Frame #050
Video Capture: Frame #051
Video Capture: Frame #052
Video Capture: Frame #053
Video Capture: Frame #054
Video Capture: Frame #055
Video Capture: Frame #056
Video Capture: Frame #057
Video Capture: Frame #058
Video Capture: Frame #059

test MMAP (no poll, REQBUFS): OK

Video Capture: Frame #000 (select)
Video Capture: Frame #001 (select)
Video Capture: Frame #002 (select)
Video Capture: Frame #003 (select)
Video Capture: Frame #004 (select)
Video Capture: Frame #005 (select)
Video Capture: Frame #006 (select)
Video Capture: Frame #007 (select)
Video Capture: Frame #008 (select)
Video Capture: Frame #009 (select)
Video Capture: Frame #010 (select)
Video Capture: Frame #011 (select)
Video Capture: Frame #012 (select)
Video Capture: Frame #013 (select)
Video Capture: Frame #014 (select)
Video Capture: Frame #015 (select)
Video Capture: Frame #016 (select)
Video Capture: Frame #017 (select)
Video Capture: Frame #018 (select)
Video Capture: Frame #019 (select)
Video Capture: Frame #020 (select)
Video Capture: Frame #021 (select)
Video Capture: Frame #022 (select)
Video Capture: Frame #023 (select)
Video Capture: Frame #024 (select)
Video Capture: Frame #025 (select)
Video Capture: Frame #026 (select)
Video Capture: Frame #027 (select)
Video Capture: Frame #028 (select)
Video Capture: Frame #029 (select)
Video Capture: Frame #030 (select)
Video Capture: Frame #031 (select)
Video Capture: Frame #032 (select)
Video Capture: Frame #033 (select)
Video Capture: Frame #034 (select)
Video Capture: Frame #035 (select)
Video Capture: Frame #036 (select)
Video Capture: Frame #037 (select)
Video Capture: Frame #038 (select)
Video Capture: Frame #039 (select)
Video Capture: Frame #040 (select)
Video Capture: Frame #041 (select)
Video Capture: Frame #042 (select)
Video Capture: Frame #043 (select)
Video Capture: Frame #044 (select)
Video Capture: Frame #045 (select)
Video Capture: Frame #046 (select)
Video Capture: Frame #047 (select)
Video Capture: Frame #048 (select)
Video Capture: Frame #049 (select)
Video Capture: Frame #050 (select)
Video Capture: Frame #051 (select)
Video Capture: Frame #052 (select)
Video Capture: Frame #053 (select)
Video Capture: Frame #054 (select)
Video Capture: Frame #055 (select)
Video Capture: Frame #056 (select)
Video Capture: Frame #057 (select)
Video Capture: Frame #058 (select)
Video Capture: Frame #059 (select)

test MMAP (select, REQBUFS): OK

Video Capture: Frame #000 (epoll)
Video Capture: Frame #001 (epoll)
Video Capture: Frame #002 (epoll)
Video Capture: Frame #003 (epoll)
Video Capture: Frame #004 (epoll)
Video Capture: Frame #005 (epoll)
Video Capture: Frame #006 (epoll)
Video Capture: Frame #007 (epoll)
Video Capture: Frame #008 (epoll)
Video Capture: Frame #009 (epoll)
Video Capture: Frame #010 (epoll)
Video Capture: Frame #011 (epoll)
Video Capture: Frame #012 (epoll)
Video Capture: Frame #013 (epoll)
Video Capture: Frame #014 (epoll)
Video Capture: Frame #015 (epoll)
Video Capture: Frame #016 (epoll)
Video Capture: Frame #017 (epoll)
Video Capture: Frame #018 (epoll)
Video Capture: Frame #019 (epoll)
Video Capture: Frame #020 (epoll)
Video Capture: Frame #021 (epoll)
Video Capture: Frame #022 (epoll)
Video Capture: Frame #023 (epoll)
Video Capture: Frame #024 (epoll)
Video Capture: Frame #025 (epoll)
Video Capture: Frame #026 (epoll)
Video Capture: Frame #027 (epoll)
Video Capture: Frame #028 (epoll)
Video Capture: Frame #029 (epoll)
Video Capture: Frame #030 (epoll)
Video Capture: Frame #031 (epoll)
Video Capture: Frame #032 (epoll)
Video Capture: Frame #033 (epoll)
Video Capture: Frame #034 (epoll)
Video Capture: Frame #035 (epoll)
Video Capture: Frame #036 (epoll)
Video Capture: Frame #037 (epoll)
Video Capture: Frame #038 (epoll)
Video Capture: Frame #039 (epoll)
Video Capture: Frame #040 (epoll)
Video Capture: Frame #041 (epoll)
Video Capture: Frame #042 (epoll)
Video Capture: Frame #043 (epoll)
Video Capture: Frame #044 (epoll)
Video Capture: Frame #045 (epoll)
Video Capture: Frame #046 (epoll)
Video Capture: Frame #047 (epoll)
Video Capture: Frame #048 (epoll)
Video Capture: Frame #049 (epoll)
Video Capture: Frame #050 (epoll)
Video Capture: Frame #051 (epoll)
Video Capture: Frame #052 (epoll)
Video Capture: Frame #053 (epoll)
Video Capture: Frame #054 (epoll)
Video Capture: Frame #055 (epoll)
Video Capture: Frame #056 (epoll)
Video Capture: Frame #057 (epoll)
Video Capture: Frame #058 (epoll)
Video Capture: Frame #059 (epoll)

test MMAP (epoll, REQBUFS): OK

Video Capture: Frame #000
Video Capture: Frame #001
Video Capture: Frame #002
Video Capture: Frame #003
Video Capture: Frame #004
Video Capture: Frame #005
Video Capture: Frame #006
Video Capture: Frame #007
Video Capture: Frame #008
Video Capture: Frame #009
Video Capture: Frame #010
Video Capture: Frame #011
Video Capture: Frame #012
Video Capture: Frame #013
Video Capture: Frame #014
Video Capture: Frame #015
Video Capture: Frame #016
Video Capture: Frame #017
Video Capture: Frame #018
Video Capture: Frame #019
Video Capture: Frame #020
Video Capture: Frame #021
Video Capture: Frame #022
Video Capture: Frame #023
Video Capture: Frame #024
Video Capture: Frame #025
Video Capture: Frame #026
Video Capture: Frame #027
Video Capture: Frame #028
Video Capture: Frame #029
Video Capture: Frame #030
Video Capture: Frame #031
Video Capture: Frame #032
Video Capture: Frame #033
Video Capture: Frame #034
Video Capture: Frame #035
Video Capture: Frame #036
Video Capture: Frame #037
Video Capture: Frame #038
Video Capture: Frame #039
Video Capture: Frame #040
Video Capture: Frame #041
Video Capture: Frame #042
Video Capture: Frame #043
Video Capture: Frame #044
Video Capture: Frame #045
Video Capture: Frame #046
Video Capture: Frame #047
Video Capture: Frame #048
Video Capture: Frame #049
Video Capture: Frame #050
Video Capture: Frame #051
Video Capture: Frame #052
Video Capture: Frame #053
Video Capture: Frame #054
Video Capture: Frame #055
Video Capture: Frame #056
Video Capture: Frame #057
Video Capture: Frame #058
Video Capture: Frame #059

test MMAP (no poll, CREATE_BUFS): OK

Video Capture: Frame #000 (select)
Video Capture: Frame #001 (select)
Video Capture: Frame #002 (select)
Video Capture: Frame #003 (select)
Video Capture: Frame #004 (select)
Video Capture: Frame #005 (select)
Video Capture: Frame #006 (select)
Video Capture: Frame #007 (select)
Video Capture: Frame #008 (select)
Video Capture: Frame #009 (select)
Video Capture: Frame #010 (select)
Video Capture: Frame #011 (select)
Video Capture: Frame #012 (select)
Video Capture: Frame #013 (select)
Video Capture: Frame #014 (select)
Video Capture: Frame #015 (select)
Video Capture: Frame #016 (select)
Video Capture: Frame #017 (select)
Video Capture: Frame #018 (select)
Video Capture: Frame #019 (select)
Video Capture: Frame #020 (select)
Video Capture: Frame #021 (select)
Video Capture: Frame #022 (select)
Video Capture: Frame #023 (select)
Video Capture: Frame #024 (select)
Video Capture: Frame #025 (select)
Video Capture: Frame #026 (select)
Video Capture: Frame #027 (select)
Video Capture: Frame #028 (select)
Video Capture: Frame #029 (select)
Video Capture: Frame #030 (select)
Video Capture: Frame #031 (select)
Video Capture: Frame #032 (select)
Video Capture: Frame #033 (select)
Video Capture: Frame #034 (select)
Video Capture: Frame #035 (select)
Video Capture: Frame #036 (select)
Video Capture: Frame #037 (select)
Video Capture: Frame #038 (select)
Video Capture: Frame #039 (select)
Video Capture: Frame #040 (select)
Video Capture: Frame #041 (select)
Video Capture: Frame #042 (select)
Video Capture: Frame #043 (select)
Video Capture: Frame #044 (select)
Video Capture: Frame #045 (select)
Video Capture: Frame #046 (select)
Video Capture: Frame #047 (select)
Video Capture: Frame #048 (select)
Video Capture: Frame #049 (select)
Video Capture: Frame #050 (select)
Video Capture: Frame #051 (select)
Video Capture: Frame #052 (select)
Video Capture: Frame #053 (select)
Video Capture: Frame #054 (select)
Video Capture: Frame #055 (select)
Video Capture: Frame #056 (select)
Video Capture: Frame #057 (select)
Video Capture: Frame #058 (select)
Video Capture: Frame #059 (select)

test MMAP (select, CREATE_BUFS): OK

Video Capture: Frame #000 (epoll)
Video Capture: Frame #001 (epoll)
Video Capture: Frame #002 (epoll)
Video Capture: Frame #003 (epoll)
Video Capture: Frame #004 (epoll)
Video Capture: Frame #005 (epoll)
Video Capture: Frame #006 (epoll)
Video Capture: Frame #007 (epoll)
Video Capture: Frame #008 (epoll)
Video Capture: Frame #009 (epoll)
Video Capture: Frame #010 (epoll)
Video Capture: Frame #011 (epoll)
Video Capture: Frame #012 (epoll)
Video Capture: Frame #013 (epoll)
Video Capture: Frame #014 (epoll)
Video Capture: Frame #015 (epoll)
Video Capture: Frame #016 (epoll)
Video Capture: Frame #017 (epoll)
Video Capture: Frame #018 (epoll)
Video Capture: Frame #019 (epoll)
Video Capture: Frame #020 (epoll)
Video Capture: Frame #021 (epoll)
Video Capture: Frame #022 (epoll)
Video Capture: Frame #023 (epoll)
Video Capture: Frame #024 (epoll)
Video Capture: Frame #025 (epoll)
Video Capture: Frame #026 (epoll)
Video Capture: Frame #027 (epoll)
Video Capture: Frame #028 (epoll)
Video Capture: Frame #029 (epoll)
Video Capture: Frame #030 (epoll)
Video Capture: Frame #031 (epoll)
Video Capture: Frame #032 (epoll)
Video Capture: Frame #033 (epoll)
Video Capture: Frame #034 (epoll)
Video Capture: Frame #035 (epoll)
Video Capture: Frame #036 (epoll)
Video Capture: Frame #037 (epoll)
Video Capture: Frame #038 (epoll)
Video Capture: Frame #039 (epoll)
Video Capture: Frame #040 (epoll)
Video Capture: Frame #041 (epoll)
Video Capture: Frame #042 (epoll)
Video Capture: Frame #043 (epoll)
Video Capture: Frame #044 (epoll)
Video Capture: Frame #045 (epoll)
Video Capture: Frame #046 (epoll)
Video Capture: Frame #047 (epoll)
Video Capture: Frame #048 (epoll)
Video Capture: Frame #049 (epoll)
Video Capture: Frame #050 (epoll)
Video Capture: Frame #051 (epoll)
Video Capture: Frame #052 (epoll)
Video Capture: Frame #053 (epoll)
Video Capture: Frame #054 (epoll)
Video Capture: Frame #055 (epoll)
Video Capture: Frame #056 (epoll)
Video Capture: Frame #057 (epoll)
Video Capture: Frame #058 (epoll)
Video Capture: Frame #059 (epoll)

test MMAP (epoll, CREATE_BUFS): OK test USERPTR (no poll): OK (Not Supported) test USERPTR (select): OK (Not Supported) test DMABUF (no poll): OK (Not Supported) test DMABUF (select): OK (Not Supported)

Total for virtio-media device /dev/video0: 59, Succeeded: 59, Failed: 0, Warnings: 0

---
Changes in v11:
- Initialize controls' size value to zero
(https://lore.kernel.org/all/[email protected])
- Framevec updated to work for multiple controls
- virtio_device_ready() is now called after early error paths
- Make g_input and g_output ioctls use _IOR version of cmd instead of _IOWR
- Fix behavior where poll does not report the CAPTURE queue readable after the LAST buffer
- Ensure event mutex is locked during probe
- Mmap returns EIO if the session error state is set
- Changed g_input and g_output ioctls to be _IOR instead of _IOWR to
match the v4l2 specification and virtio-media virtual device implementation

Changes in v10:
- Rebased on top of v7.3-rc1
- Add missing padding in ``struct virtio_media_cmd_mmap``
- Add ``virtio_media_config`` to uapi header and use proper ``cread`` during init
- Remove redundant assignment of ``vfl_type``
- Fix tear down order of the video device and resources in ``virtio_media_remove()``
- Call ``virtio_device_ready()`` before starting device
- Move from ``devm`` to manual memory management to prevent potential use after free
- Detach unused buffers from the virtqueues during device remove
- Remove wait timeout during kick command
- Fix use after free in case of transport-level error
- Add additional validity check for scatterlist data buffer
- Ensure PFNs are not truncated
- Use dynamic ``shadow_buffer_size`` in ``scatterlist_builder`` instead of the ``VIRTIO_SHADOW_BUF_SIZE`` constant to guard against future modifications
- Fix case where exact fit into a shadow buffer was wrongly rejected
- Fail early if ``virtio_get_shm_region()`` fails
- Move guest allocation before host call in ``reqbufs`` and ``createbufs``
- Clean up host-side mmap if ``io_remap_pfn_range()`` fails
- Ensure command failure returns in ``ext_controls`` ioctls
- Replace array ``vmalloc`` allocations with ``vcalloc`` for overflow protection
- Add check in ``dqbuf`` ioctl if no buffer is in the queue in case multiple threads call ``VIDIOC_DQBUF``
- Change ``copy_from_user()``/``copy_to_user()`` failure return value from ``EINVAL`` to ``EFAULT``
- Ensure reserved fields are initialized to zero
- Ensure ``device_type`` from config area is valid
- Set ``done`` flag after ``resp_len`` to address a race in the condition check fast path
- Do not leave host session open if guest allocations fail
- Rename ``errno`` to ``error`` in ``virtio_media`` UAPI to prevent compilation errors in userspaces apps that include ``errno.h``
- Keep user pages pinned during ``ext_ctrls`` request

Changes in v9:
- Removed note from cover letter about the dependency on the VIRTIO_ID_MEDIA patch since this was merged.

Changes in v8:
- Fix usage of integer types in uapi
- Add uapi header test exemption due to depenency on currently exempt videodev2.h

Changes in v7:
- Removed USERPTR feature
- Updated Kconfig dependency to include little endian and 64bit platforms (not only ARM and x86)
- Fixed incorrect constant in vfl_dir detection
- Clarified that error codes returned by the host are positive integers

Changes in v6:
- Added missing "WITH Linux-syscall-note" for SPDX-License-Identifier in ``include/uapi/linux/virtio_media.h``
- Rebased on top of v7.2-rc1

Changes in v5:
- Add DMA buffer alignment and padding for commands, responses, and the event buffer
- Corrected styling of kernel-doc comments
- Removed the configurable ``driver_name`` module parameter
- Moved the protocol to ``include/uapi/linux/virtio_media.h``
- Link to v4: https://lore.kernel.org/all/[email protected]/

Changes in v4:
- Rebased on top of v7.1-rc1
- Replace usages of filep->private_data with file_to_v4l2_fh()
throughout the driver
- Link to v3: https://lore.kernel.org/r/[email protected]

Changes in v3:
- Rebased on top of v6.15-rc1 and removes obsolete control callbacks.
- Link to v2: https://lore.kernel.org/r/[email protected]

Changes in v2:
- Fixed kernel test robot and media CI warnings (ignored a few false positives).
- Changed in-driver email address to personal one since my Google one
will soon become invalid.
- Link to v1: https://lore.kernel.org/r/[email protected]

Brian Daniels (5):
media: virtio: Add core driver and session management
media: virtio: Add V4L2 ioctl forwarding infrastructure
media: virtio: Add extended controls support
media: virtio: Add buffer streaming, event handling, and poll
media: virtio: Add MMAP buffer mapping support

Nick Rogers (1):
media: virtio: clear the size of legacy controls built on the stack

 MAINTAINERS                                |    8 +
 drivers/media/Kconfig                      |   13 +
 drivers/media/Makefile                     |    2 +
 drivers/media/virtio/Makefile              |    7 +
 drivers/media/virtio/scatterlist_builder.c |  596 +++++++++
 drivers/media/virtio/scatterlist_builder.h |  125 ++
 drivers/media/virtio/session.h             |  135 ++
 drivers/media/virtio/virtio_media.h        |   95 ++
 drivers/media/virtio/virtio_media_driver.c | 1071 +++++++++++++++
 drivers/media/virtio/virtio_media_ioctls.c | 1411 ++++++++++++++++++++
 include/uapi/linux/virtio_media.h          |  309 +++++
 usr/include/Makefile                       |    1 +
 12 files changed, 3773 insertions(+)
 create mode 100644 drivers/media/virtio/Makefile
 create mode 100644 drivers/media/virtio/scatterlist_builder.c
 create mode 100644 drivers/media/virtio/scatterlist_builder.h
 create mode 100644 drivers/media/virtio/session.h
 create mode 100644 drivers/media/virtio/virtio_media.h
 create mode 100644 drivers/media/virtio/virtio_media_driver.c
 create mode 100644 drivers/media/virtio/virtio_media_ioctls.c
 create mode 100644 include/uapi/linux/virtio_media.h

base-commit: d7e7bca7169873b46e857c025c10f3336c1258d8

Signature · 1 line
2.56.1.750.gf70dc682cf-goog
#1 lore raw

PATCH v11 1/6 media: virtio: Add core driver and session management

From: Alexandre Courbot <[email protected]>

Add the initial virtio-media driver core, build system integration, MAINTAINERS entry, and V4L2 session lifecycle management.

The driver binds to VIRTIO_ID_MEDIA devices, reads device capabilities and device node type from the virtio configuration space, sets up the command virtqueue for synchronous host requests, and registers the V4L2 and video devices. Opening and closing the video device creates and destroys a host-backed session via VIRTIO_MEDIA_CMD_OPEN and VIRTIO_MEDIA_CMD_CLOSE.

Protocol structures in the UAPI header include explicit __reserved fields solely to guarantee 64-bit alignment rather than for future protocol expansion. Because the UAPI header includes linux/videodev2.h, which is currently excluded from standalone UAPI header compilation checks (CONFIG_UAPI_HEADER_TEST=y), add linux/virtio_media.h to the same exception list in usr/include/Makefile.

---
 MAINTAINERS                                |   8 +
 drivers/media/Kconfig                      |  13 +
 drivers/media/Makefile                     |   2 +
 drivers/media/virtio/Makefile              |   7 +
 drivers/media/virtio/session.h             |  58 +++
 drivers/media/virtio/virtio_media.h        |  70 +++
 drivers/media/virtio/virtio_media_driver.c | 504 +++++++++++++++++++++
 include/uapi/linux/virtio_media.h          | 118 +++++
 usr/include/Makefile                       |   1 +
 9 files changed, 781 insertions(+)
 create mode 100644 drivers/media/virtio/Makefile
 create mode 100644 drivers/media/virtio/session.h
 create mode 100644 drivers/media/virtio/virtio_media.h
 create mode 100644 drivers/media/virtio/virtio_media_driver.c
 create mode 100644 include/uapi/linux/virtio_media.h
MAINTAINERS +8 -0
index 760791e36..30c565537 100644
@@ -28973,6 +28973,7 @@ F:	Documentation/devicetree/bindings/virtio/
 F:	Documentation/driver-api/virtio/
 F:	drivers/block/virtio_blk.c
 F:	drivers/crypto/virtio/
+F:	drivers/media/virtio/
 F:	drivers/vdpa/
 F:	drivers/virtio/
 F:	include/linux/vdpa.h
@@ -29085,6 +29086,13 @@ S:	Maintained
 F:	drivers/iommu/virtio-iommu.c
 F:	include/uapi/linux/virtio_iommu.h
 
+VIRTIO MEDIA DRIVER
+M:	Brian Daniels <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	drivers/media/virtio/
+F:	include/uapi/linux/virtio_media.h
+
 VIRTIO MEM DRIVER
 M:	David Hildenbrand <[email protected]>
 L:	[email protected]
drivers/media/Kconfig +13 -0
index 6abc9302c..ce7d088e7 100644
@@ -136,6 +136,19 @@ config MEDIA_PLATFORM_SUPPORT
 
 	  Say Y when you want to be able to see such devices.
 
+config MEDIA_VIRTIO
+	tristate "Virtio-media Driver"
+	depends on VIRTIO && VIDEO_DEV && 64BIT && (X86 || CPU_LITTLE_ENDIAN)
+	select VIDEOBUF2_CORE
+	select VIDEOBUF2_MEMOPS
+	help
+	  Enables the virtio-media driver.
+
+	  This driver is used to virtualize media devices such as cameras or
+	  decoders from a host into a guest using the V4L2 protocol.
+
+	  If unsure, say N.
+
 config MEDIA_TEST_SUPPORT
 	bool
 	prompt "Test drivers" if MEDIA_SUPPORT_FILTER
drivers/media/Makefile +2 -0
index 20fac24e4..357e786cc 100644
@@ -23,6 +23,8 @@ obj-$(CONFIG_DVB_CORE) += dvb-core/
 # There are both core and drivers at RC subtree - merge before drivers
 obj-y += rc/
 
+obj-$(CONFIG_MEDIA_VIRTIO) += virtio/
+
 obj-$(CONFIG_CEC_CORE) += cec/
 
 #
drivers/media/virtio/Makefile new file +7 -0
new file mode 100644
index 000000000..09d9834da
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Makefile for the virtio-media device driver.
+
+virtio-media-objs := virtio_media_driver.o
+
+obj-$(CONFIG_MEDIA_VIRTIO) += virtio-media.o
drivers/media/virtio/session.h new file +58 -0

58 lines not on this page · raw message

drivers/media/virtio/virtio_media.h new file +70 -0

70 lines not on this page · raw message

drivers/media/virtio/virtio_media_driver.c new file +504 -0

504 lines not on this page · raw message

include/uapi/linux/virtio_media.h new file +118 -0

118 lines not on this page · raw message

usr/include/Makefile +1 -0
index ee69dd9d9..df106b5d9 100644
@@ -37,6 +37,7 @@ no-header-test += linux/usb/audio.h
 no-header-test += linux/v4l2-mediabus.h
 no-header-test += linux/v4l2-subdev.h
 no-header-test += linux/videodev2.h
+no-header-test += linux/virtio_media.h
 no-header-test += linux/vm_sockets.h
 no-header-test += sound/asequencer.h
 no-header-test += sound/asoc.h
Signature · 1 line
2.56.1.750.gf70dc682cf-goog
#2 lore raw

Re: [PATCH v11 1/6] media: virtio: Add core driver and session management

Thank you for your contribution! Sashiko AI review found 6 potential issues to consider: - [High] media: virtio: UAF and NULL deref on close after virtio_media_remove() - [High] media: virtio…

Thank you for your contribution! Sashiko AI review found 6 potential issues to consider:
- [High] media: virtio: UAF and NULL deref on close after virtio_media_remove()
- [High] media: virtio: unsynchronized commandq access and stack UAF on cb_param
- [High] media: virtio: stack cb_param left queued if virtqueue_kick() fails
- [Medium] media: virtio: unsigned status negation in virtio_media_kick_command()
- [Low] media: virtio: MEDIA_VIRTIO misplaced in device types Kconfig menu
- [Low] media: virtio: malformed kernel-doc and missing include in headers
--

commit c335528a6819af8be1759670843febeb88a66360
Author: Alexandre Courbot <[email protected]>

media: virtio: Add core driver and session management

This commit adds the initial virtio-media driver core, build system integration, V4L2 device registration, and session open/close lifecycle handling over the command virtqueue.

Quoted 14 lines
drivers/media/Kconfig +6 -0
index 6abc9302cd84d..ce7d088e74418 100644
@@ -136,6 +136,19 @@ config MEDIA_PLATFORM_SUPPORT
 
 	  Say Y when you want to be able to see such devices.
 
+config MEDIA_VIRTIO
+	tristate "Virtio-media Driver"
+	depends on VIRTIO && VIDEO_DEV && 64BIT && (X86 || CPU_LITTLE_ENDIAN)
+	select VIDEOBUF2_CORE
+	select VIDEOBUF2_MEMOPS
+	help

drivers/media/Kconfig config MEDIA_PLATFORM_SUPPORT · line 154

Quoted 10 lines
drivers/media/Kconfig +7 -0
+	  Enables the virtio-media driver.
+
+	  This driver is used to virtualize media devices such as cameras or
+	  decoders from a host into a guest using the V4L2 protocol.
+
+	  If unsure, say N.
+
 config MEDIA_TEST_SUPPORT
 	bool
 	prompt "Test drivers" if MEDIA_SUPPORT_FILTER

[Severity: Low]
Should MEDIA_VIRTIO be placed under the "Media drivers" menu instead of "Media device types"? When MEDIA_SUPPORT_FILTER is enabled, VIDEO_DEV is hidden and only defaults to y if one of the device-type filter options (such as MEDIA_CAMERA_SUPPORT or MEDIA_PLATFORM_SUPPORT) is selected, so MEDIA_VIRTIO cannot be seen or enabled on its own.

Quoted 5 lines
drivers/media/virtio/virtio_media_driver.c new file +0 -0
new file mode 100644
index 0000000000000..39c5a38d20b1b

[ ... ]

Quoted 43 lines
drivers/media/virtio/virtio_media_driver.c new file +43 -0
+static void commandq_callback(struct virtqueue *queue)
+{
+	unsigned int len;
+	struct virtio_media_cmd_callback_param *param;
+
+process_bufs:
+	while ((param = virtqueue_get_buf(queue, &len))) {
+		param->resp_len = len;
+		param->done = true;
+		wake_up(&param->vv->wq);
+	}
+
+	if (!virtqueue_enable_cb(queue)) {
+		virtqueue_disable_cb(queue);
+		goto process_bufs;
+	}
+}
+
+/**
+ * virtio_media_kick_command() - send a command to the commandq.
+ * @vv: virtio-media device in use.
+ * @sgs: descriptor chain to send.
+ * @out_sgs: number of device-readable descriptors in @sgs.
+ * @in_sgs: number of device-writable descriptors in @sgs.
+ * @resp_len: output parameter. Upon success, contains the size of the response
+ *            in bytes.
+ */
+static int virtio_media_kick_command(struct virtio_media *vv,
+				     struct scatterlist **sgs,
+				     const size_t out_sgs, const size_t in_sgs,
+				     size_t *resp_len)
+{
+	struct virtio_media_cmd_callback_param cb_param = {
+		.vv = vv,
+		.done = false,
+		.resp_len = 0,
+	};
+	struct virtio_media_resp_header *resp_header;
+	int ret = virtqueue_add_sgs(vv->commandq, sgs, out_sgs, in_sgs,
+		  &cb_param, GFP_ATOMIC);
+	if (ret) {
+		v4l2_err(&vv->v4l2_dev,
+			 "failed to add sgs to command virtqueue\n");

drivers/media/virtio/virtio_media_driver.c line 207

Quoted 10 lines
drivers/media/virtio/virtio_media_driver.c new file +10 -0
+		return ret;
+	}
+
+	if (!virtqueue_kick(vv->commandq)) {
+		v4l2_err(&vv->v4l2_dev, "failed to kick command virtqueue\n");
+		return -EINVAL;
+	}
+
+	/* Wait for the response. */
+	wait_event(vv->wq, cb_param.done);

[Severity: High]
Can commandq_callback() race with virtio_media_kick_command() on both cb_param and vv->commandq?

CPU0 CPU1 (<hardirq>)
virtio_media_kick_command()
virtqueue_add_sgs(..., &cb_param)
virtqueue_kick(vv->commandq)

                                      commandq_callback()
                                        param = virtqueue_get_buf(...)
                                        param->done = true;

wait_event(vv->wq, cb_param.done)
return 0; /* cb_param stack frame popped */
wake_up(&param->vv->wq);
<-- stack use-after-return
mutex_unlock(&vv->vlock)
/* next command on CPU0 */
mutex_lock(&vv->vlock)
virtqueue_add_sgs(vv->commandq, ...)
virtqueue_enable_cb(queue)
<-- concurrent vq access

Virtqueue operations are not internally locked, and vv->vlock only serializes process-context callers. Once param->done is set to true, the waiter on CPU0 can return from virtio_media_kick_command() before commandq_callback() reads param->vv, and a subsequent command can call virtqueue_add_sgs() or virtqueue_kick() concurrently with virtqueue_get_buf() and virtqueue_enable_cb() in the interrupt handler.

In addition, wait_event() waits in TASK_UNINTERRUPTIBLE with no timeout while holding vv->vlock, so an unresponsive device will hang the calling task indefinitely and block virtio_media_remove().

[Severity: High]
What happens to the queued &cb_param token if virtqueue_kick() fails in virtio_media_kick_command()?

At that point virtqueue_add_sgs() and virtqueue_kick_prepare() have already published the descriptor chain and the stack-allocated &cb_param pointer into vv->commandq. Returning -EINVAL immediately pops the stack frame (and in virtio_media_device_close() also frees session->cmd.close) while the buffer remains queued, so a later completion on vv->commandq will write to the popped stack frame in commandq_callback().

Quoted 12 lines
drivers/media/virtio/virtio_media_driver.c new file +12 -0
+
+	if (resp_len)
+		*resp_len = cb_param.resp_len;
+
+	if (in_sgs > 0) {
+		/*
+		 * If we expect a response, make sure we have at least a
+		 * response header - anything shorter is invalid.
+		 */
+		if (cb_param.resp_len < sizeof(*resp_header)) {
+			v4l2_err(&vv->v4l2_dev,
+				 "received response header is too short\n");

drivers/media/virtio/virtio_media_driver.c line 230

Quoted 10 lines
drivers/media/virtio/virtio_media_driver.c new file +10 -0
+			return -EINVAL;
+		}
+
+		resp_header = sg_virt(sgs[out_sgs]);
+		if (resp_header->status)
+			/* Host returns a positive error code. */\n> +			return -resp_header->status;
+	}
+
+	return 0;
+}

[Severity: Medium]
Can negating resp_header->status return a positive int or an invalid errno?

resp_header->status is an unsigned 32-bit __le32. If the device writes a value with bit 31 set (for example, a negative 32-bit errno such as 0xffffffea), -resp_header->status evaluates in unsigned arithmetic and converts to a positive int, which virtio_media_send_command() treats as success because it only checks for ret < 0. If resp_header->status is between MAX_ERRNO + 1 (4096) and 0x80000000, the negative return value propagates out of virtio_media_device_open() to VFS open, where ERR_PTR(ret) does not satisfy IS_ERR() and is treated as a valid file pointer.

Also, protocol fields marked __le32 in resp_header, cmd_open, resp_open, and cmd_close are accessed directly without cpu_to_le32() and le32_to_cpu(), which will trigger Sparse endianness warnings.

[ ... ]

Quoted 14 lines
drivers/media/virtio/virtio_media_driver.c new file +14 -0
+static int virtio_media_device_close(struct file *file)
+{
+	struct video_device *video_dev = video_devdata(file);
+	struct virtio_media *vv = to_virtio_media(video_dev);
+	struct virtio_media_session *session =
+		fh_to_session(file->private_data);
+
+	int ret = virtio_media_session_close(vv, session);
+
+	virtio_media_session_remove(vv, session);
+	virtio_media_session_free(session);
+
+	return ret;
+}

[ ... ]

Quoted 29 lines
drivers/media/virtio/virtio_media_driver.c new file +29 -0
+static void virtio_media_remove(struct virtio_device *virtio_dev)
+{
+	struct virtio_media *vv = virtio_dev->priv;
+	struct list_head *p, *n;
+
+	/* Remove the video device to stop accessing the commandq virtqueue */
+	video_unregister_device(&vv->video_dev);
+
+	/*
+	 * Acquire vlock to ensure no concurrent accesses to the commandq
+	 * virtqueue
+	 */
+	mutex_lock(&vv->vlock);
+
+	/* Stop all virtqueue callbacks */
+	virtio_reset_device(virtio_dev);
+
+	/*
+	 * Only detach the unused buffers to allow internal virtqueue clean up.
+	 * The actual buffers are freed in virtio_media_release()
+	 */
+	while (virtqueue_detach_unused_buf(vv->commandq))
+		;
+
+	/* Delete the virtqueues */
+	virtio_dev->config->del_vqs(virtio_dev);
+
+	mutex_unlock(&vv->vlock);
+

drivers/media/virtio/virtio_media_driver.c line 480

Quoted 10 lines
drivers/media/virtio/virtio_media_driver.c new file +10 -0
+	list_for_each_safe(p, n, &vv->sessions) {
+		struct virtio_media_session *s =
+			list_entry(p, struct virtio_media_session, list);
+
+		virtio_media_session_remove(vv, s);
+		virtio_media_session_free(s);
+	}
+
+	v4l2_device_put(&vv->v4l2_dev);
+}

[Severity: High]
What happens when an open V4L2 file descriptor is closed after virtio_media_remove() runs?

CPU0 CPU1
virtio_media_remove()
video_unregister_device()
...
virtio_dev->config->del_vqs()
list_for_each_safe(..., &vv->sessions)

    virtio_media_session_remove(vv, s)
    virtio_media_session_free(s)
      v4l2_fh_del(&s->fh, s->file)
        /* sets file->private_data = NULL */
      kfree(s)
                                      v4l2_release(file)
                                        virtio_media_device_close(file)
                                          session = fh_to_session(NULL)
                                          virtio_media_session_close(vv, NULL)
                                            cmd_close->hdr.cmd = ...
                                              <-- NULL pointer dereference

video_unregister_device() prevents new opens, but existing open file descriptors still invoke virtio_media_device_close() when closed. Because virtio_media_remove() already destroyed vv->commandq, cleared file->private_data via v4l2_fh_del(), and freed each session (while iterating vv->sessions without holding vv->sessions_lock), closing the fd afterward dereferences a NULL or freed session and accesses the deleted vv->commandq virtqueue.

Quoted 6 lines
include/uapi/linux/virtio_media.h new file +0 -0
new file mode 100644
index 0000000000000..ad05d742165c7
@@ -0,0 +1,118 @@

[ ... ]

Quoted 8 lines

+/**
+ * struct virtio_media_config - Video device configuration space.
+ * @device_caps: flags representing the device capabilities as used in &struct
+ * v4l2_capability. It corresponds with the device_caps field in
+ * the &struct video_device
+ * @ device_type: informs the driver of the type of the video device. It
+ * corresponds to with the ``vfl_devnod_type`` field of the
+ * device.

[ ... ]

Quoted 1 line

+#endif // _UAPI__LINUX_VIRTIO_MEDIA_H

[Severity: Low]
The space in "@ device_type:" prevents kernel-doc from recognizing the member description, and the trailing "//" comment on #endif violates C90 comment rules for exported UAPI headers. In addition, drivers/media/virtio/session.h and drivers/media/virtio/virtio_media.h use __dma_from_device_group_begin() and __dma_from_device_group_end() without including <linux/dma-mapping.h>, and kernel-doc warns on those macros inside kernel-doc annotated structs.

Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
#3 lore raw

PATCH v11 2/6 media: virtio: Add V4L2 ioctl forwarding infrastructure

In reply to Brian Daniels

From: Alexandre Courbot <[email protected]>

Introduce the scatterlist builder and synchronous V4L2 ioctl forwarding via VIRTIO_MEDIA_CMD_IOCTL.

The scatterlist builder constructs virtio descriptor chains for ioctl commands and responses, mapping 1:1 kernel memory and vmalloc buffers directly into scatterlists when possible while falling back to a per-session shadow buffer otherwise.

Use this infrastructure to implement VIDIOC_QUERYCAP from the virtio configuration space along with fixed-size read, write, and read-write V4L2 ioctls covering format negotiation, frame sizes and intervals, control and menu queries, inputs and outputs, audio, selection, video standards, tuners, and DV timings.

---
 drivers/media/virtio/Makefile              |   2 +-
 drivers/media/virtio/scatterlist_builder.c | 222 ++++++++
 drivers/media/virtio/scatterlist_builder.h |  90 +++
 drivers/media/virtio/session.h             |  28 +-
 drivers/media/virtio/virtio_media.h        |   9 +
 drivers/media/virtio/virtio_media_driver.c |  24 +-
 drivers/media/virtio/virtio_media_ioctls.c | 606 +++++++++++++++++++++
 include/uapi/linux/virtio_media.h          |  43 ++
 8 files changed, 1020 insertions(+), 4 deletions(-)
 create mode 100644 drivers/media/virtio/scatterlist_builder.c
 create mode 100644 drivers/media/virtio/scatterlist_builder.h
 create mode 100644 drivers/media/virtio/virtio_media_ioctls.c
drivers/media/virtio/Makefile +1 -1
index 09d9834da..f1bc8a3ce 100644
@@ -2,6 +2,6 @@
 #
 # Makefile for the virtio-media device driver.
 
-virtio-media-objs := virtio_media_driver.o
+virtio-media-objs := scatterlist_builder.o virtio_media_ioctls.o virtio_media_driver.o
 
 obj-$(CONFIG_MEDIA_VIRTIO) += virtio-media.o
drivers/media/virtio/scatterlist_builder.c new file +222 -0

222 lines not on this page · raw message

drivers/media/virtio/scatterlist_builder.h new file +90 -0

90 lines not on this page · raw message

drivers/media/virtio/session.h +26 -2
index 4ade7fb9c..6fe7ff5ae 100644
@@ -9,17 +9,32 @@
 #ifndef __VIRTIO_MEDIA_SESSION_H
 #define __VIRTIO_MEDIA_SESSION_H
 
+#include <linux/scatterlist.h>
 #include <media/v4l2-fh.h>
 
 #include "uapi/linux/virtio_media.h"
 
+/*
+ * Size of the per-session virtio shadow and event buffers. 16K should be
+ * enough to contain everything we need.
+ */
+#define VIRTIO_SHADOW_BUF_SIZE 0x4000
+
 /**
  * struct virtio_media_session - A session on a virtio_media device.
  * @fh: file handler for the session.
  * @file: file pointer associated with the session's file handler.
  * @id: session ID used to communicate with the device.
- * @cmd: union of session-level commands. A session can have one command
- *       currently running.
+ * @cmd: union of session commands ``close`` and ``ioctl``. A session can have
+ *       one command currently running. The rest of the commands are handled by
+ *       &struct virtio_media.
+ * @resp: union of responses to session commands. A session can wait on one
+ *        command only. The rest of the responses are handled by
+ *        &struct virtio_media.
+ * @shadow_buf: shadow buffer where data to be added to the descriptor chain can
+ *              be staged before being sent to the device.
+ * @command_sgs: SG table gathering descriptors for a given command and its
+ *               response.
  * @list: link into the list of sessions for the device.
  */
 struct virtio_media_session {
@@ -30,9 +45,18 @@ struct virtio_media_session {
 	__dma_from_device_group_begin();
 	union {
 		struct virtio_media_cmd_close close;
+		struct virtio_media_cmd_ioctl ioctl;
 	} cmd;
+
+	union {
+		struct virtio_media_resp_ioctl ioctl;
+	} resp;
 	__dma_from_device_group_end();
 
+	void *shadow_buf;
+
+	struct sg_table command_sgs;
+
 	struct list_head list;
 };
 
drivers/media/virtio/virtio_media.h +9 -0
index 68299377a..a120c1014 100644
@@ -14,6 +14,8 @@
 
 #include "uapi/linux/virtio_media.h"
 
+#define DESC_CHAIN_MAX_LEN SG_MAX_SINGLE_ALLOC
+
 #define VIRTIO_MEDIA_DEFAULT_DRIVER_NAME "virtio-media"
 
 /**
@@ -66,5 +68,12 @@ to_virtio_media(struct video_device *video_dev)
 int virtio_media_send_command(struct virtio_media *vv, struct scatterlist **sgs,
 			      const size_t out_sgs, const size_t in_sgs,
 			      size_t minimum_resp_len, size_t *resp_len);
+
+/* virtio_media_ioctls.c */
+
+long virtio_media_device_ioctl(struct file *file, unsigned int cmd,
+			       unsigned long arg);
+extern const struct v4l2_ioctl_ops virtio_media_ioctl_ops;
+
 #endif // __VIRTIO_MEDIA_H
 
drivers/media/virtio/virtio_media_driver.c +23 -1
index 39c5a38d2..0fe20cf50 100644
@@ -37,10 +37,20 @@ static struct virtio_media_session *
 virtio_media_session_alloc(struct virtio_media *vv, struct file *file)
 {
 	struct virtio_media_session *session;
+	int ret;
 
 	session = kzalloc_obj(*session, GFP_KERNEL);
 	if (!session)
-		return ERR_PTR(-ENOMEM);
+		goto err_session;
+
+	session->shadow_buf = kzalloc(VIRTIO_SHADOW_BUF_SIZE, GFP_KERNEL);
+	if (!session->shadow_buf)
+		goto err_shadow_buf;
+
+	ret = sg_alloc_table(&session->command_sgs, DESC_CHAIN_MAX_LEN,
+			     GFP_KERNEL);
+	if (ret)
+		goto err_payload_sgs;
 
 	// The caller is expected to set the ID once the host assigns a value.
 	session->id = 0;
@@ -50,6 +60,13 @@ virtio_media_session_alloc(struct virtio_media *vv, struct file *file)
 	virtio_media_session_fh_add(session, file);
 
 	return session;
+
+err_payload_sgs:
+	kfree(session->shadow_buf);
+err_shadow_buf:
+	kfree(session);
+err_session:
+	return ERR_PTR(-ENOMEM);
 }
 
 /**
@@ -77,6 +94,9 @@ static void virtio_media_session_free(struct virtio_media_session *session)
 	virtio_media_session_fh_del(session);
 	v4l2_fh_exit(&session->fh);
 
+	sg_free_table(&session->command_sgs);
+
+	kfree(session->shadow_buf);
 	kfree(session);
 }
 
@@ -342,6 +362,7 @@ static const struct v4l2_file_operations virtio_media_fops = {
 	.owner = THIS_MODULE,
 	.open = virtio_media_device_open,
 	.release = virtio_media_device_close,
+	.unlocked_ioctl = virtio_media_device_ioctl,
 };
 
 static void virtio_media_release(struct v4l2_device *v4l2_dev)
@@ -394,6 +415,7 @@ static int virtio_media_probe(struct virtio_device *virtio_dev)
 
 	vd = &vv->video_dev;
 	vd->v4l2_dev = &vv->v4l2_dev;
+	vd->ioctl_ops = &virtio_media_ioctl_ops;
 	vd->fops = &virtio_media_fops;
 	vd->release = video_device_release_empty;
 	strscpy(vd->name, "virtio-media", sizeof(vd->name));
drivers/media/virtio/virtio_media_ioctls.c new file +606 -0

606 lines not on this page · raw message

include/uapi/linux/virtio_media.h +43 -0

47 lines not on this page · raw message

Signature · 1 line
2.56.1.750.gf70dc682cf-goog
#4 lore raw

Re: [PATCH v11 2/6] media: virtio: Add V4L2 ioctl forwarding infrastructure

Thank you for your contribution! Sashiko AI review found 7 potential issues to consider: - [High] media: virtio: DMA mapping of kernel stack in scatterlist_builder_add_data() - [High] media: virtio…

Thank you for your contribution! Sashiko AI review found 7 potential issues to consider:
- [High] media: virtio: DMA mapping of kernel stack in scatterlist_builder_add_data()
- [High] media: virtio: pfn_to_kaddr() build and KASAN bug in retrieve_data()
- [High] media: virtio: session use-after-free on unbind in virtio_media_remove()
- [High] media: virtio: V4L2 core and compat bypass in virtio_media_device_ioctl()
- [Medium] media: virtio: unaligned shadow_buffer_pos in scatterlist_builder_add_data()
- [Medium] media: virtio: missing NUL-termination of cap->card in virtio_media_querycap()
- [Medium] media: virtio: uninitialized stack variables in virtio_media_g_input/output()
--

commit 2de20993548662c5f3f30aa219959343b41cbc39
Author: Alexandre Courbot <[email protected]>

media: virtio: Add V4L2 ioctl forwarding infrastructure

This commit introduces a scatterlist builder and synchronous V4L2 ioctl forwarding via VIRTIO_MEDIA_CMD_IOCTL, implementing VIDIOC_QUERYCAP and fixed-size V4L2 ioctls.

Quoted 5 lines
drivers/media/virtio/scatterlist_builder.c new file +0 -0
new file mode 100644
index 0000000000000..ae8ffee82fa6e

[ ... ]

Quoted 16 lines
drivers/media/virtio/scatterlist_builder.c new file +16 -0
+int scatterlist_builder_add_data(struct scatterlist_builder *builder,
+				 void *data, size_t len)
+{
+	const size_t cur_desc = builder->cur_desc;
+
+	if (len == 0)
+		return 0;
+
+	if (builder->cur_desc >= builder->num_descs)
+		return -ENOSPC;
+
+	if (!always_use_shadow_buffer && virt_addr_valid(data) &&
+	    virt_addr_valid(data + len)) {
+		/*
+		 * If "data" is in the 1:1 physical memory mapping then we can
+		 * use a single SG entry and avoid copying.

drivers/media/virtio/scatterlist_builder.c line 81

Quoted 10 lines
drivers/media/virtio/scatterlist_builder.c new file +10 -0
+		 */
+		struct page *page = virt_to_page(data);
+		size_t offset = (((size_t)data) & ~PAGE_MASK);
+		struct scatterlist *next_desc =
+			&builder->descs[builder->cur_desc];
+
+		memset(next_desc, 0, sizeof(*next_desc));
+		sg_set_page(next_desc, page, len, offset);
+		builder->cur_desc++;
+	} else if (!always_use_shadow_buffer && is_vmalloc_addr(data)) {

[Severity: High]
Does scatterlist_builder_add_data() map kernel stack buffers directly for DMA instead of falling back to builder->shadow_buffer?

Both video_usercopy() (for ioctl arguments up to 128 bytes) and handlers such as virtio_media_g_input() and virtio_media_device_ioctl() pass stack-allocated buffers here. When CONFIG_VMAP_STACK=y, stack addresses satisfy is_vmalloc_addr(data); when CONFIG_VMAP_STACK=n, they satisfy virt_addr_valid(data). Without checking !object_is_on_stack(data), stack pages are placed directly into the virtqueue scatterlist, violating the DMA API contract when DMA mapping is used (triggering CONFIG_DMA_API_DEBUG check_for_stack() warnings and risking stack corruption on non-coherent platforms).

Also, virt_addr_valid(data + len) checks one byte past the end of the buffer rather than data + len - 1.

[ ... ]

Quoted 15 lines
drivers/media/virtio/scatterlist_builder.c new file +15 -0
+	} else {
+		/*
+		 * As a last resort, copy into the shadow buffer and reference
+		 * it with a single SG entry. Calling
+		 * scatterlist_builder_retrieve_data() will be necessary to copy
+		 * the data written by the device back into @data.
+		 */
+		void *shadow_buffer =
+			builder->shadow_buffer + builder->shadow_buffer_pos;
+		struct page *page = virt_to_page(shadow_buffer);
+		unsigned long offset =
+			(((unsigned long)shadow_buffer) & ~PAGE_MASK);
+		struct scatterlist *next_desc =
+			&builder->descs[builder->cur_desc];
+

drivers/media/virtio/scatterlist_builder.c line 140

Quoted 10 lines
drivers/media/virtio/scatterlist_builder.c new file +10 -0
+		if (len >
+		    builder->shadow_buffer_size - builder->shadow_buffer_pos)
+			return -ENOSPC;
+
+		memcpy(shadow_buffer, data, len);
+		memset(next_desc, 0, sizeof(*next_desc));
+		sg_set_page(next_desc, page, len, offset);
+		builder->cur_desc++;
+		builder->shadow_buffer_pos += len;
+	}

[Severity: Medium]
Can advancing builder->shadow_buffer_pos by an unaligned len pack separate DMA_TO_DEVICE and DMA_FROM_DEVICE descriptors into the same DMA cacheline?

When multiple descriptors use the shadow buffer (for example, cmd_ioctl at 12 bytes followed by resp_ioctl at 8 bytes and the response payload), packing them at unaligned offsets shares a single cacheline across bidirectional DMA mappings and leaves subsequent shadow buffer entries misaligned. In addition, this path unconditionally runs memcpy(shadow_buffer, data, len) even when staging device-writable (_IOR) response buffers.

[ ... ]

Quoted 15 lines
drivers/media/virtio/scatterlist_builder.c new file +15 -0
+int scatterlist_builder_retrieve_data(struct scatterlist_builder *builder,
+				      size_t sg_index, void *data)
+{
+	void *shadow_buf = builder->shadow_buffer;
+	struct scatterlist *sg;
+	void *kaddr;
+
+	/* We can only retrieve from the range of sgs currently set. */
+	if (sg_index >= builder->cur_sg)
+		return -ERANGE;
+
+	sg = builder->sgs[sg_index];
+	kaddr = pfn_to_kaddr(page_to_pfn(sg_page(sg))) + sg->offset;
+
+	if (kaddr >= shadow_buf &&

drivers/media/virtio/scatterlist_builder.c line 185

Quoted 10 lines
drivers/media/virtio/scatterlist_builder.c new file +10 -0
+	    kaddr < shadow_buf + builder->shadow_buffer_size) {
+		if (kaddr + sg->length >
+		    shadow_buf + builder->shadow_buffer_size)
+			return -EINVAL;
+
+		memcpy(data, kaddr, sg->length);
+	}
+
+	return 0;
+}

[Severity: High]
Should this use sg_virt(sg) instead of pfn_to_kaddr(page_to_pfn(sg_page(sg))) + sg->offset?

On powerpc, pfn_to_kaddr() returns const void *, failing compilation with -Werror=discarded-qualifiers when assigned to void *kaddr, and on alpha and x86_64 UML pfn_to_kaddr() is not defined. On arm64 with tag-based KASAN (CONFIG_KASAN_SW_TAGS or CONFIG_KASAN_HW_TAGS), pfn_to_kaddr() returns an untagged linear address (top byte 0xff) while shadow_buf from kzalloc() carries a KASAN tag, so the shadow_buf range check evaluates to false and silently skips copying the device response back into data.

Quoted 4 lines
drivers/media/virtio/virtio_media_driver.c +0 -0
index 39c5a38d20b1b..0fe20cf508212 100644

[ ... ]

drivers/media/virtio/virtio_media_driver.c static void virtio_media_session_free(struct virtio_media_session *session) · line 101

Quoted 9 lines
drivers/media/virtio/virtio_media_driver.c +3 -0
@@ -77,6 +94,9 @@ static void virtio_media_session_free(struct virtio_media_session *session)
 	virtio_media_session_fh_del(session);
 	v4l2_fh_exit(&session->fh);
 
+	sg_free_table(&session->command_sgs);
+
+	kfree(session->shadow_buf);
 	kfree(session);
 }

[Severity: High]
Can session->command_sgs, session->shadow_buf, and session be used after free and double freed if the device is removed while a file descriptor is open?

virtio_media_remove() frees all sessions in vv->sessions via virtio_media_session_free() while open struct file instances still reference session->fh:

drivers/media/virtio/virtio_media_driver.c:virtio_media_remove() {
    ...
	list_for_each_safe(p, n, &vv->sessions) {
		struct virtio_media_session *s =
			list_entry(p, struct virtio_media_session, list);

		virtio_media_session_remove(vv, s);
		virtio_media_session_free(s);
	}
    ...
}

When userspace later closes the file descriptor, v4l2_release() invokes virtio_media_device_close(), which accesses the freed session and calls virtio_media_session_free(session) a second time:

CPU0 CPU1
virtio_media_remove()
video_unregister_device(...)
...
virtio_media_session_free(s)

    sg_free_table(&s->command_sgs)
    kfree(s->shadow_buf)
    kfree(s)
                                  v4l2_release()
                                    virtio_media_device_close()
                                      virtio_media_session_close(vv, s)
                                        <-- use-after-free
                                      virtio_media_session_free(s)
                                        <-- double free
Quoted 5 lines
drivers/media/virtio/virtio_media_ioctls.c new file +0 -0
new file mode 100644
index 0000000000000..e92032bce7dbe

[ ... ]

Quoted 6 lines
drivers/media/virtio/virtio_media_ioctls.c new file +6 -0
+static int virtio_media_querycap(struct file *file, void *fh,
+				 struct v4l2_capability *cap)
+{
+	struct video_device *video_dev = video_devdata(file);
+	struct virtio_media *vv = to_virtio_media(video_dev);
+

drivers/media/virtio/virtio_media_ioctls.c line 328

Quoted 10 lines
drivers/media/virtio/virtio_media_ioctls.c new file +10 -0
+	strscpy(cap->bus_info, "platform:virtio-media");
+	strscpy(cap->driver, VIRTIO_MEDIA_DEFAULT_DRIVER_NAME);
+
+	virtio_cread_bytes(vv->virtio_dev, 8, cap->card, sizeof(cap->card));
+
+	cap->capabilities = video_dev->device_caps | V4L2_CAP_DEVICE_CAPS;
+	cap->device_caps = video_dev->device_caps;
+
+	return 0;
+}

[Severity: Medium]
Can virtio_media_querycap() leave cap->card without a NUL terminator?

In include/uapi/linux/virtio_media.h, struct virtio_media_config documents that card does not need to be NUL-terminated when all 32 bytes are used, whereas V4L2 requires struct v4l2_capability.card to be a NUL-terminated string.

Quoted 9 lines
drivers/media/virtio/virtio_media_ioctls.c new file +9 -0
+/*
+ * s/g_input/output work with an unsigned int - recast this to a u32 so the
+ * size is unambiguous.
+ */
+
+static int virtio_media_g_input(struct file *file, void *fh, unsigned int *i)
+{
+	u32 input;
+

drivers/media/virtio/virtio_media_ioctls.c line 348

Quoted 10 lines
drivers/media/virtio/virtio_media_ioctls.c new file +10 -0
+	int ret = virtio_media_send_r_ioctl(file_to_v4l2_fh(file),
+					 VIDIOC_G_INPUT, &input,
+					 sizeof(input));
+	if (ret)
+		return ret;
+
+	*i = input;
+
+	return 0;
+}

[Severity: Medium]
Does virtio_media_g_input() (and virtio_media_g_output() below) pass uninitialized stack memory to scatterlist_builder_add_data()?

Because input and output are not initialized before calling virtio_media_send_r_ioctl(), the shadow buffer fallback in scatterlist_builder_add_data() reads 4 bytes of uninitialized stack memory via memcpy(shadow_buffer, data, len), and an incomplete host write leaves uninitialized stack bytes in *i or *o.

[ ... ]

Quoted 53 lines
drivers/media/virtio/virtio_media_ioctls.c new file +53 -0
+long virtio_media_device_ioctl(struct file *file, unsigned int cmd,
+			       unsigned long arg)
+{
+	struct video_device *video_dev = video_devdata(file);
+	struct virtio_media *vv = to_virtio_media(video_dev);
+	struct v4l2_fh *vfh = NULL;
+	struct v4l2_standard standard;
+	v4l2_std_id std_id = 0;
+	int ret;
+
+	if (test_bit(V4L2_FL_USES_V4L2_FH, &video_dev->flags))
+		vfh = file_to_v4l2_fh(file);
+
+	mutex_lock(&vv->vlock);
+
+	/*
+	 * We need to handle a few ioctls manually because their results
+	 * rely on vfd->tvnorms, which is normally updated by the driver
+	 * as S_INPUT is called. Since we want to just pass these ioctls
+	 * through, we have to hijack them from here.
+	 */
+	switch (cmd) {
+	case VIDIOC_S_STD:
+		ret = copy_from_user(&std_id, (void __user *)arg,
+				     sizeof(std_id));
+		if (ret) {
+			ret = -EFAULT;
+			break;
+		}
+		ret = virtio_media_s_std(file, vfh, std_id);
+		break;
+	case VIDIOC_ENUMSTD:
+		ret = copy_from_user(&standard, (void __user *)arg,
+				     sizeof(standard));
+		if (ret) {
+			ret = -EFAULT;
+			break;
+		}
+		ret = virtio_media_enumstd(file, vfh, &standard);
+		if (ret)
+			break;
+		ret = copy_to_user((void __user *)arg, &standard,
+				   sizeof(standard));
+		if (ret)
+			ret = -EFAULT;
+		break;
+	case VIDIOC_QUERYSTD:
+		ret = virtio_media_querystd(file, vfh, &std_id);
+		if (ret)
+			break;
+		ret = copy_to_user((void __user *)arg, &std_id, sizeof(std_id));
+		if (ret)
+			ret = -EFAULT;

drivers/media/virtio/virtio_media_ioctls.c line 606

Quoted 10 lines
drivers/media/virtio/virtio_media_ioctls.c new file +10 -0
+		break;
+	default:
+		ret = video_ioctl2(file, cmd, arg);
+		break;
+	}
+
+	mutex_unlock(&vv->vlock);
+
+	return ret;
+}

[Severity: High]
Does intercepting VIDIOC_S_STD, VIDIOC_ENUMSTD, and VIDIOC_QUERYSTD before video_ioctl2() bypass V4L2 registration, priority, and 32-bit compat handling?

Unlike __video_do_ioctl(), these three branches do not check video_is_registered(video_dev) after acquiring vv->vlock. If virtio_media_device_ioctl() blocks on mutex_lock(&vv->vlock) while virtio_media_remove() unregisters the device, deletes vv->commandq, and frees all sessions, these branches proceed to dereference the freed session and deleted virtqueue:

CPU0 CPU1
v4l2_ioctl()
video_is_registered(vdev)
virtio_media_device_ioctl()

                                  virtio_media_remove()
                                    video_unregister_device(...)
                                    mutex_lock(&vv->vlock)
                                    ...
                                    virtio_dev->config->del_vqs(...)
                                    mutex_unlock(&vv->vlock)
                                    virtio_media_session_free(s)
    mutex_lock(&vv->vlock)
    virtio_media_querystd()
      ...                         <-- use-after-free of s and commandq

In addition, 32-bit compat userspace on x86_64 issues VIDIOC_ENUMSTD32, which misses the VIDIOC_ENUMSTD case and falls through to video_ioctl2() -> v4l_enumstd(), failing with -EINVAL because video_dev->tvnorms is 0. Bypassing video_ioctl2() also skips is_valid_ioctl(), v4l2_prio_check() on VIDIOC_S_STD, and INFO_FL_CLEAR zeroing of struct v4l2_standard fields beyond index on VIDIOC_ENUMSTD.

Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=2
#5 lore raw

PATCH v11 3/6 media: virtio: Add extended controls support

In reply to Brian Daniels

From: Alexandre Courbot <[email protected]>

Add support for VIDIOC_G_EXT_CTRLS, VIDIOC_S_EXT_CTRLS, and VIDIOC_TRY_EXT_CTRLS.

Extended controls carry an auxiliary array of struct v4l2_ext_control entries and may reference userspace payload buffers. Pin userspace control payloads using vb2_create_framevec() for the duration of the virtio command and pass their physical memory segments to the host as an array of struct virtio_media_sg_entry descriptors in the session shadow buffer.

---
 drivers/media/virtio/scatterlist_builder.c | 302 +++++++++++++++++++++
 drivers/media/virtio/scatterlist_builder.h |  27 ++
 drivers/media/virtio/virtio_media_ioctls.c | 164 +++++++++++
 include/uapi/linux/virtio_media.h          |  13 +
 4 files changed, 506 insertions(+)
drivers/media/virtio/scatterlist_builder.c +302 -0
index ae8ffee82..63d50369f 100644
@@ -220,3 +220,305 @@ int scatterlist_builder_add_ioctl_resp(struct scatterlist_builder *builder,
 	return scatterlist_builder_add_data(builder, resp_ioctl,
 					    sizeof(*resp_ioctl));
 }
+
+/**
+ * __scatterlist_builder_add_userptr() - Add user pages to @builder.
+ * @builder: builder to use.
+ * @userptr: pointer to userspace memory that we want to add.
+ * @length: length of the data to add.
+ * @sg_list: output parameter. Upon success, points to the area of the shadow
+ *           buffer containing the array of SG entries to be added to the
+ *           descriptor chain.
+ * @nents: output parameter. Upon success, contains the number of entries
+ *         pointed to by @sg_list.
+ *
+ * Data referenced by userspace pointers can be potentially large and very
+ * scattered, which could overwhelm the descriptor chain if added as-is. For
+ * these, we instead build an array of &struct virtio_media_sg_entry in the
+ * shadow buffer and reference it using a single descriptor.
+ *
+ * This function is a helper to perform that. Callers should then add the
+ * descriptor to the chain properly.
+ *
+ * Returns %-EFAULT if @userptr is not a valid user address, which is a case the
+ * driver should consider as "normal" operation. All other failures signal a
+ * problem with the driver.
+ */
+static int
+__scatterlist_builder_add_userptr(struct scatterlist_builder *builder,
+				  unsigned long userptr, unsigned long length,
+				  struct virtio_media_sg_entry **sg_list,
+				  int *nents)
+{
+	struct sg_table sg_table = {};
+	struct frame_vector *framevec;
+	struct scatterlist *sg_iter;
+	struct page **pages;
+	const unsigned int offset = userptr & ~PAGE_MASK;
+	unsigned int pages_count;
+	size_t entries_size;
+	size_t initial_cur_framevec = builder->cur_framevec;
+	int i;
+	int ret;
+
+	if (builder->cur_framevec >= builder->num_framevecs) {
+		pr_err("Ran out of framevecs (%zu/%zu)", builder->cur_framevec,
+		       builder->num_framevecs);
+		ret = -ENOMEM;
+	}
+
+	framevec = vb2_create_framevec(userptr, length, true);
+	if (IS_ERR(framevec)) {
+		if (PTR_ERR(framevec) != -EFAULT) {
+			pr_warn("error %ld creating frame vector for userptr 0x%lx, length 0x%lx\n",
+				PTR_ERR(framevec), userptr, length);
+		} else {
+			/* -EINVAL is expected in case of invalid userptr. */
+			framevec = ERR_PTR(-EINVAL);
+		}
+		return PTR_ERR(framevec);
+	}
+
+	pages = frame_vector_pages(framevec);
+	if (IS_ERR(pages)) {
+		pr_warn("error getting vector pages\n");
+		ret = PTR_ERR(pages);
+		goto free_framevec;
+	}
+	pages_count = frame_vector_count(framevec);
+	ret = sg_alloc_table_from_pages(&sg_table, pages, pages_count, offset,
+					length, 0);
+	if (ret) {
+		pr_warn("error creating sg table\n");
+		goto free_framevec;
+	}
+
+	/* Allocate our actual SG in the shadow buffer. */
+	*nents = sg_nents(sg_table.sgl);
+	entries_size = sizeof(**sg_list) * *nents;
+	if (builder->shadow_buffer_pos + entries_size >
+	    builder->shadow_buffer_size) {
+		ret = -ENOMEM;
+		goto free_sg;
+	}
+
+	*sg_list = builder->shadow_buffer + builder->shadow_buffer_pos;
+	builder->shadow_buffer_pos += entries_size;
+
+	for_each_sgtable_sg(&sg_table, sg_iter, i) {
+		struct virtio_media_sg_entry *sg_entry = &(*sg_list)[i];
+
+		sg_entry->start = sg_phys(sg_iter);
+		sg_entry->len = sg_iter->length;
+		sg_entry->__reserved = 0;
+	}
+
+	builder->framevecs[builder->cur_framevec++] = framevec;
+
+free_sg:
+	sg_free_table(&sg_table);
+free_framevec:
+	// Only destroy the framevec if we didn't save it
+	if (builder->cur_framevec == initial_cur_framevec && framevec)
+		vb2_destroy_framevec(framevec);
+	return ret;
+}
+
+/**
+ * scatterlist_builder_add_userptr() - Add a user-memory buffer using an array
+ *                                     of &struct virtio_media_sg_entry.
+ * @builder: builder to use.
+ * @userptr: pointer to userspace memory that we want to add.
+ * @length: length of the data to add.
+ *
+ * Upon success, an array of &struct virtio_media_sg_entry referencing
+ * @userptr has been built into the shadow buffer, and that array added to the
+ * descriptor chain.
+ */
+static int scatterlist_builder_add_userptr(struct scatterlist_builder *builder,
+					   unsigned long userptr,
+					   unsigned long length)
+{
+	int ret;
+	int nents;
+	struct virtio_media_sg_entry *sg_list;
+
+	ret = __scatterlist_builder_add_userptr(builder, userptr, length,
+						&sg_list, &nents);
+	if (ret)
+		return ret;
+
+	ret = scatterlist_builder_add_data(builder, sg_list,
+					   sizeof(*sg_list) * nents);
+	if (ret)
+		return ret;
+
+	return 0;
+}
+
+/**
+ * scatterlist_builder_add_ext_ctrls() - Add a &struct v4l2_ext_controls and its
+ *                                       controls to @builder.
+ * @builder: builder to use.
+ * @ctrls: &struct v4l2_ext_controls to add.
+ *
+ * Add @ctrls and its array of &struct v4l2_ext_control to the descriptor
+ * chain.
+ */
+int scatterlist_builder_add_ext_ctrls(struct scatterlist_builder *builder,
+				      struct v4l2_ext_controls *ctrls)
+{
+	int ret;
+
+	/* v4l2_ext_controls */
+	ret = scatterlist_builder_add_data(builder, ctrls, sizeof(*ctrls));
+	if (ret)
+		return ret;
+
+	if (ctrls->count > 0) {
+		/* array of v4l2_controls */
+		ret = scatterlist_builder_add_data(builder, ctrls->controls,
+						   sizeof(ctrls->controls[0]) *
+							   ctrls->count);
+		if (ret)
+			return ret;
+	}
+
+	return 0;
+}
+
+/**
+ * scatterlist_builder_allocate_framevecs() - Allocate the pointers to store
+ *                                            framevecs during a request.
+ * @builder: builder to use.
+ * @ctrls: &struct v4l2_ext_controls from which we determine how many framevecs
+ *         are needed
+ *
+ * The framevecs are used to pin the user pages during the request. Once the
+ * request is completed, the allocated framevecs and pointers should be freed
+ * with scatterlist_builder_free_framevecs().
+ */
+int
+scatterlist_builder_allocate_framevecs(struct scatterlist_builder *builder,
+				       struct v4l2_ext_controls *ctrls)
+{
+	int i;
+
+	builder->cur_framevec = 0;
+
+	/* Count the pointers to user memory in individual controls */
+	for (i = 0; i < ctrls->count; i++) {
+		struct v4l2_ext_control *ctrl = &ctrls->controls[i];
+
+		if (ctrl->size > 0)
+			builder->num_framevecs += 1;
+	}
+
+	if (builder->num_framevecs > 0) {
+		builder->framevecs = kzalloc_objs(struct frame_vector*,
+						  builder->num_framevecs);
+		if (!builder->framevecs) {
+			builder->num_framevecs = 0;
+			return -ENOMEM;
+		}
+	}
+
+	return 0;
+}
+
+/**
+ * scatterlist_builder_free_framevecs() - Free the framevecs used during a
+ *                                        request.
+ * @builder: builder to use.
+ *
+ * Frees the framevecs allocated in scatterlist_builder_allocate_framevecs().
+ */
+void
+scatterlist_builder_free_framevecs(struct scatterlist_builder *builder)
+{
+	if (builder->cur_framevec && builder->framevecs) {
+		struct frame_vector *vec;
+
+		while (builder->cur_framevec--) {
+			vec = builder->framevecs[builder->cur_framevec];
+			vb2_destroy_framevec(vec);
+		}
+
+		kfree(builder->framevecs);
+	}
+
+	builder->framevecs = NULL;
+	builder->num_framevecs = 0;
+	builder->cur_framevec = 0;
+}
+
+/**
+ * scatterlist_builder_add_ext_ctrls_userptrs() - Add the userspace payloads of
+ *                                                a &struct v4l2_ext_controls
+ *                                                to the descriptor chain.
+ * @builder: builder to use.
+ * @ctrls: &struct v4l2_ext_controls from which we want to add the
+ *         userspace payload.
+ *
+ * Add the userspace payloads of @ctrls to the descriptor chain. This is split
+ * out of scatterlist_builder_add_ext_ctrls() because we only want to add
+ * these to the device-readable part of the descriptor chain.
+ */
+int
+scatterlist_builder_add_ext_ctrls_userptrs(struct scatterlist_builder *builder,
+					   struct v4l2_ext_controls *ctrls)
+{
+	int i;
+	int ret;
+
+	for (i = 0; i < ctrls->count; i++) {
+		struct v4l2_ext_control *ctrl = &ctrls->controls[i];
+
+		if (ctrl->size > 0) {
+			unsigned long uptr = (unsigned long)ctrl->ptr;
+
+			ret = scatterlist_builder_add_userptr(builder, uptr,
+							      ctrl->size);
+			if (ret)
+				return ret;
+		}
+	}
+
+	return 0;
+}
+
+/**
+ * scatterlist_builder_retrieve_ext_ctrls() - Retrieve controls written by the
+ *                                            device on the shadow buffer,
+ *                                            if needed.
+ * @builder: builder to use.
+ * @sg_index: index of the first SG entry of the controls in the builder's
+ *            descriptor chain.
+ * @ctrls: &struct v4l2_ext_controls to copy shadow buffer data into.
+ *
+ * If the shadow buffer is pointed to by @sg_index, copy its content back into
+ * @ctrls.
+ */
+int scatterlist_builder_retrieve_ext_ctrls(struct scatterlist_builder *builder,
+					   size_t sg_index,
+					   struct v4l2_ext_controls *ctrls)
+{
+	struct v4l2_ext_control *controls_backup = ctrls->controls;
+	int ret;
+
+	ret = scatterlist_builder_retrieve_data(builder, sg_index++, ctrls);
+
+	if (ret)
+		return ret;
+
+	ctrls->controls = controls_backup;
+
+	if (ctrls->count > 0 && ctrls->controls) {
+		ret = scatterlist_builder_retrieve_data(builder, sg_index++,
+							ctrls->controls);
+		if (ret)
+			return ret;
+	}
+
+	return 0;
+}
drivers/media/virtio/scatterlist_builder.h +27 -0
index 044ea409a..bced1e030 100644
@@ -25,6 +25,11 @@
  * @sgs: descriptor chain to eventually pass to virtio functions.
  * @num_sgs: total number of entries in @sgs.
  * @cur_sg: next entry in @sgs to be used.
+ * @framevecs: Array of *struct frame_vector that is allocated to keep user
+ *             pages pinned until after a response is received. It is allocated
+ *             in scatterlist_builder_add_ext_ctrls_userptrs() and freed in
+ *             scatterlist_builder_retrieve_ext_ctrls().
+ * @cur_framevec: next entry in @framevecs to be used.
  *
  * Virtio passes data from the driver to the device (through e.g.
  * virtqueue_add_sgs()) via a scatterlist that the device interprets as a
@@ -69,6 +74,10 @@ struct scatterlist_builder {
 	struct scatterlist **sgs;
 	size_t num_sgs;
 	size_t cur_sg;
+
+	struct frame_vector **framevecs;
+	size_t num_framevecs;
+	size_t cur_framevec;
 };
 
 int scatterlist_builder_add_descriptor(struct scatterlist_builder *builder,
@@ -87,4 +96,22 @@ int scatterlist_builder_add_ioctl_cmd(struct scatterlist_builder *builder,
 int scatterlist_builder_add_ioctl_resp(struct scatterlist_builder *builder,
 				       struct virtio_media_session *session);
 
+int scatterlist_builder_add_ext_ctrls(struct scatterlist_builder *builder,
+				      struct v4l2_ext_controls *ctrls);
+
+int
+scatterlist_builder_allocate_framevecs(struct scatterlist_builder *builder,
+				       struct v4l2_ext_controls *ctrls);
+
+void
+scatterlist_builder_free_framevecs(struct scatterlist_builder *builder);
+
+int
+scatterlist_builder_add_ext_ctrls_userptrs(struct scatterlist_builder *builder,
+					   struct v4l2_ext_controls *ctrls);
+
+int scatterlist_builder_retrieve_ext_ctrls(struct scatterlist_builder *builder,
+					   size_t sg_index,
+					   struct v4l2_ext_controls *ctrls);
+
 #endif // __VIRTIO_MEDIA_SCATTERLIST_BUILDER_H
drivers/media/virtio/virtio_media_ioctls.c +164 -0

200 lines not on this page · raw message

include/uapi/linux/virtio_media.h +13 -0
index c1e68d47c..f117b97fc 100644
@@ -158,4 +158,17 @@ struct virtio_media_resp_ioctl {
 	struct virtio_media_resp_header hdr;
 };
 
+/**
+ * struct virtio_media_sg_entry - Description of part of a scattered guest
+ *                                memory.
+ * @start: start guest address of the memory segment.
+ * @len: length of this memory segment.
+ * @__reserved: must be set to zero by the driver.
+ */
+struct virtio_media_sg_entry {
+	__le64 start;
+	__le32 len;
+	__le32 __reserved;
+};
+
 #endif // _UAPI__LINUX_VIRTIO_MEDIA_H
Signature · 1 line
2.56.1.750.gf70dc682cf-goog
#6 lore raw

Re: [PATCH v11 3/6] media: virtio: Add extended controls support

Thank you for your contribution! Sashiko AI review found 15 potential issues to consider: - [High] media: virtio: framevecs array leak in scatterlist_builder_free_framevecs() - [High] media: virtio…

Thank you for your contribution! Sashiko AI review found 15 potential issues to consider:
- [High] media: virtio: framevecs array leak in scatterlist_builder_free_framevecs()
- [High] media: virtio: pinned page and framevec leak on error in virtio_media_send_ext_controls_ioctl()
- [High] media: virtio: unchecked and unrestored ctrls->count in virtio_media_send_ext_controls_ioctl()
- [High] media: virtio: sgs index passed as desc_index in virtio_media_send_ext_controls_ioctl()
- [High] media: virtio: stack buffers mapped for DMA in scatterlist_builder_add_data()
- [Medium] media: virtio: missing return on framevec exhaustion in __scatterlist_builder_add_userptr()
- [Medium] media: virtio: unpinned writable user pages not marked dirty in scatterlist_builder_free_framevecs()
- [Medium] media: virtio: __scatterlist_builder_add_userptr() converts -EFAULT to -EINVAL for control pointers
- [Medium] media: virtio: gfp_mask = 0 passed to sg_alloc_table_from_pages() in __scatterlist_builder_add_userptr()
- [Medium] media: virtio: builder->framevecs leak in scatterlist_builder_free_framevecs()
- [Medium] media: virtio: missing return on framevec overflow in __scatterlist_builder_add_userptr()
- [Low] media: virtio: duplicate shadow buffer copy in scatterlist_builder_add_userptr()
- [Low] media: virtio: missing endian conversions on virtio_media_sg_entry and kernel-doc mismatch
- [Low] media: virtio: kernel-doc and num_framevecs init mismatch in scatterlist_builder
- [Low] media: virtio: missing cpu_to_le64()/cpu_to_le32() in __scatterlist_builder_add_userptr()
--

commit 4bce5e6699b198a30ba3d3b14cac75e70807d014
Author: Alexandre Courbot <[email protected]>

media: virtio: Add extended controls support

This commit adds V4L2 extended control ioctl handlers (VIDIOC_G_EXT_CTRLS, VIDIOC_S_EXT_CTRLS, and VIDIOC_TRY_EXT_CTRLS) to virtio-media, along with scatterlist builder helpers to pin userspace control payloads and pass their physical segments to the host via the session shadow buffer.

[Severity: Medium]
In drivers/media/virtio/scatterlist_builder.c, inside __scatterlist_builder_add_userptr() (lines 264-268), does the capacity check on builder->cur_framevec >= builder->num_framevecs forget to return after setting ret = -ENOMEM? Execution continues to sg_alloc_table_from_pages(), which overwrites ret, and then writes past the end of builder->framevecs at line 316 (or dereferences NULL). In addition, scatterlist_builder_allocate_framevecs() (line 407) resets builder->cur_framevec = 0 without resetting builder->num_framevecs = 0 before accumulating the count.

[Severity: Medium]
In drivers/media/virtio/scatterlist_builder.c, at lines 264-268 of __scatterlist_builder_add_userptr(), should the builder->cur_framevec >= builder->num_framevecs branch return -ENOMEM immediately instead of falling through to pin pages and write out of bounds to builder->framevecs[builder->cur_framevec++] at line 316?

[Severity: Medium]
In drivers/media/virtio/scatterlist_builder.c, inside __scatterlist_builder_add_userptr() (lines 271-279), why is -EFAULT from vb2_create_framevec() converted into -EINVAL? The V4L2 extended control ioctls (and the function's own kernel-doc comment at line 243) require -EFAULT when a control payload pointer references an invalid userspace address.

[Severity: Medium]
In drivers/media/virtio/scatterlist_builder.c, inside __scatterlist_builder_add_userptr() (lines 289-290), should sg_alloc_table_from_pages() use GFP_KERNEL instead of 0 for its gfp_mask? This path runs in sleepable ioctl process context right after GFP_KERNEL allocations, and passing 0 disables direct reclaim, kswapd reclaim, IO, and FS operations, which can cause spurious -ENOMEM failures under memory pressure.

[Severity: Low]
In drivers/media/virtio/scatterlist_builder.c, inside __scatterlist_builder_add_userptr() (lines 311-312), sg_entry->start and sg_entry->len are declared as __le64 and __le32 in struct virtio_media_sg_entry (include/uapi/linux/virtio_media.h, lines 168-172), so assigning sg_phys(sg_iter) and sg_iter->length without cpu_to_le64() and cpu_to_le32() triggers Sparse endianness warnings. Also, struct scatterlist_builder in drivers/media/virtio/scatterlist_builder.h (lines 28-32 and 78-80) is missing a @num_framevecs kernel-doc entry.

[Severity: Low]
In drivers/media/virtio/scatterlist_builder.c, inside __scatterlist_builder_add_userptr() (lines 305-306), sg_list is already allocated inside builder->shadow_buffer, yet scatterlist_builder_add_userptr() (lines 351-352) passes sg_list to scatterlist_builder_add_data(). When always_use_shadow_buffer is enabled, scatterlist_builder_add_data() copies sg_list into builder->shadow_buffer a second time and consumes double the shadow buffer space.

[Severity: High]
In drivers/media/virtio/scatterlist_builder.c, when scatterlist_builder_add_ext_ctrls() (lines 374-385) passes ctrls and ctrls->controls to scatterlist_builder_add_data() (lines 67-118), can this map kernel stack memory directly for DMA? Both video_usercopy() (which places struct v4l2_ext_controls in its stack buffer sbuf) and v4l_g_ctrl() / v4l_s_ctrl() (which allocate struct v4l2_ext_controls and struct v4l2_ext_control on the stack) pass stack addresses here. Because stack addresses satisfy virt_addr_valid() when CONFIG_VMAP_STACK=n and is_vmalloc_addr() when CONFIG_VMAP_STACK=y, scatterlist_builder_add_data() maps the stack pages directly into virtqueue scatterlists instead of bouncing them through builder->shadow_buffer, violating the DMA API.

[Severity: Low]
In drivers/media/virtio/scatterlist_builder.h (lines 28-32 and 78-80), the kernel-doc comment for struct scatterlist_builder omits @num_framevecs and names scatterlist_builder_add_ext_ctrls_userptrs() and scatterlist_builder_retrieve_ext_ctrls() instead of scatterlist_builder_allocate_framevecs() and scatterlist_builder_free_framevecs(). In drivers/media/virtio/scatterlist_builder.c, the kernel-doc for __scatterlist_builder_add_userptr() (line 243) also documents returning -EFAULT on an invalid userptr while line 277 rewrites it to -EINVAL, and scatterlist_builder_allocate_framevecs() (line 407) resets builder->cur_framevec = 0 without initializing builder->num_framevecs = 0.

[Severity: High]
In drivers/media/virtio/scatterlist_builder.c, does scatterlist_builder_free_framevecs() (lines 439-448) leak builder->framevecs when builder->cur_framevec is 0? scatterlist_builder_allocate_framevecs() (lines 417-418) allocates builder->framevecs whenever at least one control has ctrl->size > 0, so if an error occurs before the first framevec is recorded (for example, vb2_create_framevec() fails on the first control pointer), kfree(builder->framevecs) is skipped and builder->framevecs is set to NULL.

[Severity: Medium]
In drivers/media/virtio/scatterlist_builder.c, inside scatterlist_builder_free_framevecs() (lines 439-448), kfree(builder->framevecs) is guarded by builder->cur_framevec, so failing before the first framevec is added leaks the builder->framevecs array.

[Severity: Medium]
In drivers/media/virtio/scatterlist_builder.c, __scatterlist_builder_add_userptr() (line 270) pins user control payload pages as writable via vb2_create_framevec(userptr, length, true), but scatterlist_builder_free_framevecs() (lines 442-445) unpins them with vb2_destroy_framevec() without marking them dirty first. Should it call set_page_dirty_lock() on the frame_vector_pages() before destroying the framevec, as the videobuf2 memops backends do, so host writes to reclaimable or file-backed user pages are not lost?

[Severity: High]
In drivers/media/virtio/virtio_media_ioctls.c, inside virtio_media_send_ext_controls_ioctl() (lines 281 and 295-299), end_ctrls_sg is saved from builder.cur_sg (an index into builder.sgs[]), but the response loop passes i to scatterlist_builder_add_descriptor(&builder, i), which indexes builder.descs[i] (drivers/media/virtio/scatterlist_builder.c, line 41). If a precedingvmalloc buffer spans multiple non-contiguous physical pages, scatterlist_builder_add_data() uses multiple builder.descs[] entries for a single builder.sgs[] entry, causing the response chain to point at the wrong descriptors.

[Severity: High]
In drivers/media/virtio/virtio_media_ioctls.c, inside virtio_media_send_ext_controls_ioctl(), do the early error returns at lines 313-314 (return -ENOSPC when ctrls->count > num_ctrls) and lines 337-338 (return -EINVAL when resp_len < sizeof(*ctrls)) bypass the free_framevecs label? Returning directly leaks builder.framevecs and all struct frame_vector instances and leaves the userspace payload pages permanently pinned.

[Severity: High]
In drivers/media/virtio/virtio_media_ioctls.c, inside virtio_media_send_ext_controls_ioctl() (lines 308-341), ctrls->count is checked against num_ctrls before scatterlist_builder_retrieve_ext_ctrls() copies the shadow buffer response back into ctrls, and ctrls->count is not restored to num_ctrls when the device returns ctrls->count > num_ctrls. When the shadow buffer is used, scatterlist_builder_retrieve_ext_ctrls() (drivers/media/virtio/scatterlist_builder.c, lines 509-523) overwrites ctrls->count with the unvalidated value from the shadow buffer after the check; and because extended control ioctls set INFO_FL_ALWAYS_COPY, leaving ctrls->count > num_ctrls on return causes v4l2_compat_put_array_args() and v4l_print_ext_controls() to read past the end of the kernel controls array.

Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=3
#7 lore raw

PATCH v11 4/6 media: virtio: Add buffer streaming, event handling, and poll

In reply to Brian Daniels

From: Alexandre Courbot <[email protected]>

Add V4L2 buffer queue state tracking, streaming ioctls, asynchronous event virtqueue processing, V4L2 event subscription, and poll support.

Set up the event virtqueue to receive VIRTIO_MEDIA_EVT_DQBUF, VIRTIO_MEDIA_EVT_EVENT, and VIRTIO_MEDIA_EVT_ERROR notifications from the host, dispatching dequeued buffers, V4L2 events, and unrecoverable session errors to their respective sessions.

Implement buffer and streaming ioctls (VIDIOC_REQBUFS, VIDIOC_CREATE_BUFS, VIDIOC_QUERYBUF, VIDIOC_PREPARE_BUF, VIDIOC_QBUF, VIDIOC_DQBUF, VIDIOC_STREAMON, VIDIOC_STREAMOFF, and VIDIOC_DECODER_CMD) as well as VIDIOC_SUBSCRIBE_EVENT, VIDIOC_UNSUBSCRIBE_EVENT, and the poll file operation.

---
 drivers/media/virtio/scatterlist_builder.c |  72 +++
 drivers/media/virtio/scatterlist_builder.h |   8 +
 drivers/media/virtio/session.h             |  51 ++
 drivers/media/virtio/virtio_media.h        |  11 +
 drivers/media/virtio/virtio_media_driver.c | 396 ++++++++++++-
 drivers/media/virtio/virtio_media_ioctls.c | 618 ++++++++++++++++++++-
 include/uapi/linux/virtio_media.h          |  68 +++
 7 files changed, 1218 insertions(+), 6 deletions(-)
drivers/media/virtio/scatterlist_builder.c +72 -0
index 63d50369f..a4eabc932 100644
@@ -356,6 +356,78 @@ static int scatterlist_builder_add_userptr(struct scatterlist_builder *builder,
 	return 0;
 }
 
+/**
+ * scatterlist_builder_add_buffer() - Add a &struct v4l2_buffer and its planes
+ *                                    to the descriptor chain.
+ * @builder: builder to use.
+ * @b: &struct v4l2_buffer to add.
+ */
+int scatterlist_builder_add_buffer(struct scatterlist_builder *builder,
+				   struct v4l2_buffer *b)
+{
+	int ret;
+
+	/* v4l2_buffer */
+	ret = scatterlist_builder_add_data(builder, b, sizeof(*b));
+	if (ret)
+		return ret;
+
+	if (V4L2_TYPE_IS_MULTIPLANAR(b->type) && b->length > 0) {
+		/* Array of v4l2_planes */
+		ret = scatterlist_builder_add_data(builder, b->m.planes,
+						   sizeof(struct v4l2_plane) *
+							   b->length);
+		if (ret)
+			return ret;
+	}
+
+	return 0;
+}
+
+/**
+ * scatterlist_builder_retrieve_buffer() - Retrieve a &struct v4l2_buffer
+ *                                         written by the device on the shadow
+ *                                         buffer, if needed.
+ * @builder: builder to use.
+ * @sg_index: index of the first SG entry of the buffer in the builder's
+ *            descriptor chain.
+ * @b: &struct v4l2_buffer to copy shadow buffer data into.
+ * @orig_planes: the original ``planes`` pointer, to be restored if the buffer
+ *               is multi-planar.
+ *
+ * If the &struct v4l2_buffer pointed to by @sg_index was copied into the
+ * shadow buffer, then its updated content is copied back into @b.
+ * Otherwise nothing is done as the device has written into @b directly.
+ *
+ * @orig_planes is used to restore the original ``planes`` pointer in case it
+ * gets modified by the host. The specification stipulates that the host should
+ * not modify it, but we enforce this for additional safety.
+ */
+int scatterlist_builder_retrieve_buffer(struct scatterlist_builder *builder,
+					size_t sg_index, struct v4l2_buffer *b,
+					struct v4l2_plane *orig_planes)
+{
+	int ret;
+
+	ret = scatterlist_builder_retrieve_data(builder, sg_index++, b);
+	if (ret)
+		return ret;
+
+	if (V4L2_TYPE_IS_MULTIPLANAR(b->type)) {
+		b->m.planes = orig_planes;
+
+		if (orig_planes) {
+			ret = scatterlist_builder_retrieve_data(builder,
+								sg_index++,
+								b->m.planes);
+			if (ret)
+				return ret;
+		}
+	}
+
+	return 0;
+}
+
 /**
  * scatterlist_builder_add_ext_ctrls() - Add a &struct v4l2_ext_controls and its
  *                                       controls to @builder.
drivers/media/virtio/scatterlist_builder.h +8 -0
index bced1e030..f63daca33 100644
@@ -96,6 +96,14 @@ int scatterlist_builder_add_ioctl_cmd(struct scatterlist_builder *builder,
 int scatterlist_builder_add_ioctl_resp(struct scatterlist_builder *builder,
 				       struct virtio_media_session *session);
 
+int scatterlist_builder_add_buffer(struct scatterlist_builder *builder,
+				   struct v4l2_buffer *buffer);
+
+int scatterlist_builder_retrieve_buffer(struct scatterlist_builder *builder,
+					size_t sg_index,
+					struct v4l2_buffer *buffer,
+					struct v4l2_plane *orig_planes);
+
 int scatterlist_builder_add_ext_ctrls(struct scatterlist_builder *builder,
 				      struct v4l2_ext_controls *ctrls);
 
drivers/media/virtio/session.h +51 -0

86 lines not on this page · raw message

drivers/media/virtio/virtio_media.h +11 -0
index a120c1014..8b21c1941 100644
@@ -24,8 +24,12 @@
  * @video_dev: video_device for the media device.
  * @virtio_dev: virtio device for the media device.
  * @commandq: virtio command queue.
+ * @eventq: virtio event queue.
+ * @eventq_work: work to run when events are received on @eventq.
+ * @event_buffer: buffer for event descriptors.
  * @sessions: list of active sessions on the device.
  * @sessions_lock: protects @sessions and &struct virtio_media_session.list.
+ * @events_lock: prevents concurrent processing of events.
  * @cmd: union of device-level commands. Session commands are handled by
  *       &struct virtio_media_session.
  * @resp: union of responses to device-level commands. Session responses are
@@ -39,10 +43,16 @@ struct virtio_media {
 
 	struct virtio_device *virtio_dev;
 	struct virtqueue *commandq;
+	struct virtqueue *eventq;
+	struct work_struct eventq_work;
+
+	void *event_buffer;
 
 	struct list_head sessions;
 	struct mutex sessions_lock; /* protects sessions list */
 
+	struct mutex events_lock; /* prevents concurrent event processing */
+
 	__dma_from_device_group_begin();
 	union {
 		struct virtio_media_cmd_open open;
@@ -68,6 +78,7 @@ to_virtio_media(struct video_device *video_dev)
 int virtio_media_send_command(struct virtio_media *vv, struct scatterlist **sgs,
 			      const size_t out_sgs, const size_t in_sgs,
 			      size_t minimum_resp_len, size_t *resp_len);
+void virtio_media_process_events(struct virtio_media *vv);
 
 /* virtio_media_ioctls.c */
 
drivers/media/virtio/virtio_media_driver.c +391 -5

532 lines not on this page · raw message

drivers/media/virtio/virtio_media_ioctls.c +617 -1

674 lines not on this page · raw message

include/uapi/linux/virtio_media.h +68 -0

72 lines not on this page · raw message

Signature · 1 line
2.56.1.750.gf70dc682cf-goog
#8 lore raw

Re: [PATCH v11 4/6] media: virtio: Add buffer streaming, event handling, and poll

Thank you for your contribution! Sashiko AI review found 17 potential issues to consider: - [High] media: virtio: avoid DMA mapping kernel stack buffers in add_data() - [High] media: virtio…

Thank you for your contribution! Sashiko AI review found 17 potential issues to consider:
- [High] media: virtio: avoid DMA mapping kernel stack buffers in add_data()
- [High] media: virtio: deadlock between vlock and events_lock in event processing
- [High] media: virtio: session use-after-free in virtio_media_process_events()
- [High] media: virtio: use-after-free and OOB in reqbufs and create_bufs
- [High] media: virtio: unsynchronized queue state in virtio_media_process_dqbuf_event()
- [High] media: virtio: broken EPOLLIN EOS and EPOLLOUT checks in poll()
- [High] media: virtio: cancel_work_sync() before reset in remove and probe
- [High] media: virtio: OOB queue->buffers and leak in reqbufs()/create_bufs()
- [High] media: virtio: O_NONBLOCK bugs and STREAMOFF hang in virtio_media_dqbuf()
- [High] media: virtio: session UAF in virtio_media_dqbuf() on virtio_media_remove()
- [High] media: virtio: unchecked multiplanar b->length in dqbuf and buffer ioctls
- [Medium] media: virtio: skip plane retrieval when b->length is 0 in buffer ioctls
- [Medium] media: virtio: video_register_device() called before populating eventq
- [Medium] media: virtio: SG index used as descriptor index in send_buffer_ioctl()
- [Medium] media: virtio: missing uses_mplane and cap checks in create_bufs()
- [Low] media: virtio: missing @error_lock kernel-doc in virtio_media_session
- [Low] media: virtio: uninitialized resp_len read in virtio_media_send_command()
--

commit befde615c261fefaf68e4ecec85b8fcfd0ccacb0
Author: Alexandre Courbot <[email protected]>

media: virtio: Add buffer streaming, event handling, and poll

This commit adds V4L2 buffer queue state tracking, streaming and event subscription ioctls, asynchronous event virtqueue processing, and poll support to the virtio-media driver.

[Severity: High]
In drivers/media/virtio/scatterlist_builder.c (scatterlist_builder_add_data(), lines 67 and 81; scatterlist_builder_add_buffer(), line 371) and drivers/media/virtio/virtio_media_ioctls.c (virtio_media_streamon(), line 696), does scatterlist_builder_add_data() map kernel stack buffers directly into virtqueue scatterlists for DMA instead of staging them through the shadow buffer?

video_usercopy() places ioctl arguments up to 128 bytes (such as struct v4l2_buffer, struct v4l2_requestbuffers, struct v4l2_decoder_cmd, and struct v4l2_event_subscription) into its stack buffer sbuf[128], and virtio_media_streamon() and virtio_media_streamoff() pass the address of their stack parameter i. When always_use_shadow_buffer is false, scatterlist_builder_add_data() checks virt_addr_valid(data) and is_vmalloc_addr(data) without checking !object_is_on_stack(data), mapping stack pages directly via sg_set_page(). DMA-mapping the kernel stack violates the DMA API, triggers CONFIG_DMA_API_DEBUG warnings, and risks stack corruption on non-coherent architectures or with VIRTIO_F_ACCESS_PLATFORM.

[Severity: Medium]
In drivers/media/virtio/scatterlist_builder.c (scatterlist_builder_add_buffer(), line 375; scatterlist_builder_retrieve_buffer(), line 416) and drivers/media/virtio/virtio_media_ioctls.c (virtio_media_send_buffer_ioctl(), line 269), can scatterlist_builder_retrieve_buffer() fail with -ERANGE when b->length is 0 on a multiplanar buffer?

In drivers/media/v4l2-core/v4l2-ioctl.c, check_array_args() only replaces b->m.planes with a kernel buffer when b->length > 0, leaving the raw userspace pointer in b->m.planes when b->length is 0. scatterlist_builder_add_buffer() only adds a plane descriptor when b->length > 0, whereas virtio_media_send_buffer_ioctl() saves orig_planes = b->m.planes unconditionally for multiplanar types and scatterlist_builder_retrieve_buffer() calls scatterlist_builder_retrieve_data() whenever orig_planes is non-NULL. Calling VIDIOC_QBUF with b->length == 0 and a non-NULL b->m.planes pointer therefore fails with -ERANGE after the host has already executed the ioctl, leaving the guest and host queue states out of sync.

[Severity: Low]
In drivers/media/virtio/session.h (struct virtio_media_session, line 109), this isn't a bug, but struct virtio_media_session adds the error_lock member without a corresponding @error_lock entry in its kernel-doc comment block, which triggers a scripts/kernel-doc warning under W=1 builds.

[Severity: High]
In drivers/media/virtio/virtio_media_driver.c (virtio_media_process_dqbuf_event(), lines 412 and 445) and drivers/media/virtio/virtio_media_ioctls.c (virtio_media_qbuf(), line 935), is queue state accessed without consistent synchronization between virtio_media_process_dqbuf_event() and the buffer ioctls?

virtio_media_process_dqbuf_event() runs on vv->eventq_work holding vv->events_lock (not vv->vlock) and reads queue->allocated_bufs and writes into queue->buffers[dqbuf_evt->buffer.index] before acquiring session->queues_lock, while virtio_media_reqbufs() and virtio_media_create_bufs() free and replace queue->buffers under vv->vlock without holding session->queues_lock, allowing a concurrent DQBUF event to write into freed memory.

In addition, virtio_media_qbuf() increments queue->queued_bufs without holding session->queues_lock after virtio_media_send_buffer_ioctl() has already submitted the buffer to the host, while virtio_media_process_dqbuf_event() decrements queue->queued_bufs under session->queues_lock without holding vv->vlock; if the host signals VIRTIO_MEDIA_EVT_DQBUF before virtio_media_qbuf() increments queue->queued_bufs, queue->queued_bufs underflows to SIZE_MAX. Finally, virtio_media_process_dqbuf_event() does not check under session->queues_lock that the buffer is currently queued before calling list_add_tail(&dqbuf->list, &queue->pending_dqbufs), so a duplicate or stale DQBUF event corrupts the pending_dqbufs list.

[Severity: High]
In drivers/media/virtio/virtio_media_driver.c (virtio_media_session_close(), line 159; virtio_media_process_events(), line 471) and drivers/media/virtio/virtio_media_ioctls.c (virtio_media_subscribe_event(), line 660; virtio_media_device_ioctl(), line 1337), can virtio_media_process_events() deadlock on vv->vlock and vv->events_lock when handling VIRTIO_MEDIA_EVT_ERROR?

virtio_media_device_ioctl() holds vv->vlock across video_ioctl2(). When virtio_media_subscribe_event() is called with V4L2_EVENT_SUB_FL_SEND_INITIAL, it calls virtio_media_process_events(), which acquires vv->events_lock (lock order vv->vlock -> vv->events_lock). If a VIRTIO_MEDIA_EVT_ERROR event is processed, virtio_media_process_events() calls virtio_media_session_close(), which tries to acquire vv->vlock (lock order vv->events_lock -> vv->vlock):

CPU0 CPU1
---- ----
lock(&vv->vlock)

                                  lock(&vv->events_lock)
lock(&vv->events_lock)
                                  lock(&vv->vlock)

*** DEADLOCK ***

CPU0: virtio_media_device_ioctl() -> ... -> virtio_media_subscribe_event() ->
virtio_media_process_events()
CPU1: virtio_media_event_work() -> virtio_media_process_events() ->
virtio_media_session_close()

If VIRTIO_MEDIA_EVT_ERROR is processed directly inside the virtio_media_subscribe_event() call, the same thread attempts to lock vv->vlock a second time and self-deadlocks immediately.

[Severity: High]
In drivers/media/virtio/virtio_media_driver.c (virtio_media_find_session(), line 188; virtio_media_process_events(), line 483; virtio_media_device_close(), line 628), can virtio_media_process_events() access a freed session when racing with virtio_media_device_close()?

virtio_media_find_session() drops vv->sessions_lock before returning the session pointer, and virtio_media_device_close() removes and frees the session without acquiring vv->events_lock. In the VIRTIO_MEDIA_EVT_ERROR case, virtio_media_process_events() also sets session->error = true before calling virtio_media_session_close(), causing a racing virtio_media_device_close() to skip virtio_media_session_close() (and its vv->vlock serialization) and free the session immediately:

CPU0 (eventq_work) CPU1 (close)
virtio_media_process_events()
virtio_media_find_session()
session->error = true
virtio_media_device_close()
if (!session_error) // false virtio_media_session_remove() virtio_media_session_free(session)
virtio_media_session_close()
... <-- use-after-free
wake_up(&session->dqbuf_wait) <-- use-after-free

The same race applies to VIRTIO_MEDIA_EVT_DQBUF and VIRTIO_MEDIA_EVT_EVENT if virtio_media_device_close() finishes between virtio_media_find_session() and the event handler body.

[Severity: High]
In drivers/media/virtio/virtio_media_driver.c (virtio_media_device_poll(), line 676), do the EPOLLIN and EPOLLOUT checks in virtio_media_device_poll() mishandle end-of-stream, output buffer readiness, and single-direction streaming?

For EPOLLIN, once the last capture buffer (V4L2_BUF_FLAG_LAST) is dequeued, capture_queue->is_capture_last is true while queued_bufs is 0 and pending_dqbufs is empty. Because the first branch checks (capture_queue->queued_bufs == 0 && list_empty(&capture_queue->pending_dqbufs)) without checking !capture_queue->is_capture_last, poll() returns EPOLLERR at EOS instead of reaching the else-if branch to return EPOLLIN | EPOLLRDNORM.

For EPOLLOUT, checking output_queue->queued_bufs < output_queue->allocated_bufs instead of !list_empty(&output_queue->pending_dqbufs) causes poll() to report EPOLLOUT | EPOLLWRNORM whenever not all allocated output buffers are queued, even when no completed output buffer is available in pending_dqbufs for VIDIOC_DQBUF, causing non-blocking callers to spin in a busy loop receiving -EAGAIN.

Furthermore, when an application polls for both events (or when wait is NULL on a re-poll pass where poll_requested_events() has all bits set) while only one queue is streaming, the non-streaming queue unconditionally sets EPOLLERR.

[Severity: Medium]
In drivers/media/virtio/virtio_media_driver.c (virtio_media_probe(), line 808), should the event buffers be queued on vv->eventq before calling video_register_device()?

video_register_device() exposes the character device node to userspace immediately, creating a window where userspace can open the device and trigger host events before the virtio_media_send_event_buffer() loop has populated vv->eventq.

[Severity: High]
In drivers/media/virtio/virtio_media_driver.c (virtio_media_probe(), line 830; virtio_media_remove(), line 854), can eventq_callback() re-schedule vv->eventq_work after cancel_work_sync() in virtio_media_remove() and virtio_media_probe()?

Both teardown paths call cancel_work_sync(&vv->eventq_work) before calling virtio_reset_device(virtio_dev):

CPU0 CPU1 (<hardirq>)
virtio_media_remove()
cancel_work_sync(&vv->eventq_work)

                                  eventq_callback()
                                    schedule_work(&vv->eventq_work)
  mutex_lock(&vv->vlock)
  virtio_reset_device()
  del_vqs()
  v4l2_device_put() -> kfree(vv)
                                  virtio_media_event_work()
                                    ... <-- use-after-free

In addition, if virtio_media_send_event_buffer() fails partway through the loop in virtio_media_probe(), the error path calls del_vqs() without draining the already-queued event buffers via virtqueue_detach_unused_buf(vv->eventq).

[Severity: High]
In drivers/media/virtio/virtio_media_driver.c (virtio_media_remove(), line 879) and drivers/media/virtio/virtio_media_ioctls.c (virtio_media_dqbuf(), line 989), can virtio_media_remove() free an active session while virtio_media_dqbuf() is sleeping on session->dqbuf_wait?

virtio_media_dqbuf() unlocks vv->vlock before sleeping in wait_event_interruptible(session->dqbuf_wait, ...). Because video_unregister_device() does not wait for in-flight ioctls on open file descriptors to complete, virtio_media_remove() can acquire and release vv->vlock, iterate over vv->sessions, and call virtio_media_session_free(s) while a thread is still blocked in wait_event_interruptible() on session->dqbuf_wait, causing a use-after-free when that thread wakes or is interrupted.

[Severity: Low]
In drivers/media/virtio/virtio_media_ioctls.c (virtio_media_send_buffer_ioctl(), line 262) and drivers/media/virtio/virtio_media_driver.c (virtio_media_send_command(), line 316), is resp_len read uninitialized when virtio_media_send_buffer_ioctl() calls virtio_media_send_command()?

virtio_media_send_buffer_ioctl() declares size_t resp_len without initializing it (unlike virtio_media_send_ext_controls_ioctl(), which initializes resp_len = 0), and virtio_media_send_command() evaluates
size_t local_resp_len = resp_len ? *resp_len : 0 before writing to *resp_len.

[Severity: Medium]
In drivers/media/virtio/virtio_media_ioctls.c (virtio_media_send_buffer_ioctl(), line 282), does the response loop in virtio_media_send_buffer_ioctl() pass an SG pointer index to scatterlist_builder_add_descriptor() where a descriptor table index is expected?

end_buf_sg is initialized from builder.cur_sg (an index into builder.sgs), but scatterlist_builder_add_descriptor(&builder, i) indexes builder->descs[i]. If a vmalloc-backed buffer added by scatterlist_builder_add_data() spans two non-contiguous physical pages, it consumes two entries in builder->descs while advancing builder->cur_sg by one, so passing i to scatterlist_builder_add_descriptor() attaches the wrong descriptor to the device-writable response chain.

[Severity: High]
In drivers/media/virtio/virtio_media_ioctls.c (virtio_media_reqbufs(), line 743; virtio_media_create_bufs(), line 839), can virtio_media_create_bufs() and virtio_media_reqbufs() leave dangling list pointers in queue->pending_dqbufs?

Each struct virtio_media_buffer in queue->buffers has a list_head linked into queue->pending_dqbufs while waiting to be dequeued. virtio_media_create_bufs() shallow-copies queue->buffers into a newly allocated buffers array via memcpy() and calls vfree(queue->buffers) without updating the list pointers in queue->pending_dqbufs. Similarly, virtio_media_reqbufs() only calls virtio_media_clear_queue() when b->count == 0, so calling VIDIOC_REQBUFS with b->count > 0 while completed buffers are pending frees queue->buffers while leaving them linked in queue->pending_dqbufs. Any subsequent VIDIOC_DQBUF, VIDIOC_STREAMOFF, or VIRTIO_MEDIA_EVT_DQBUF will dereference the freed queue->buffers allocation.

[Severity: High]
In drivers/media/virtio/virtio_media_ioctls.c (virtio_media_reqbufs(), line 743; virtio_media_create_bufs(), line 839), can queue->allocated_bufs exceed the size of the queue->buffers allocation in virtio_media_reqbufs() and virtio_media_create_bufs()?

Both functions allocate buffers with vcalloc() using the caller's requested b->count before sending the ioctl to the host, and afterwards set queue->allocated_bufs = b->count (in virtio_media_reqbufs()) or queue->allocated_bufs = b->index + b->count (in virtio_media_create_bufs()). In V4L2, drivers and devices may increase count to meet minimum buffer requirements; if the host returns a larger b->count (or a larger b->index + b->count), queue->allocated_bufs will be larger than the allocated array, leading to out-of-bounds accesses on queue->buffers.

Also, in virtio_media_create_bufs(), if b->count > 0 on entry and the host returns b->count == 0 with status 0, the early return on b->count == 0 leaks the pre-allocated buffers array.

[Severity: Medium]
In drivers/media/virtio/virtio_media_ioctls.c (virtio_media_create_bufs(), line 813) and drivers/media/virtio/virtio_media_driver.c (virtio_media_device_poll(), line 654), should virtio_media_create_bufs() update session->uses_mplane, reject V4L2_MEMORY_USERPTR, and mask unsupported b->capabilities flags like virtio_media_reqbufs() does?

When a multiplanar session allocates buffers via VIDIOC_CREATE_BUFS instead of VIDIOC_REQBUFS, session->uses_mplane remains false, causing virtio_media_device_poll() to check the unallocated single-planar queues and return EPOLLERR.

[Severity: High]
In drivers/media/virtio/virtio_media_ioctls.c (virtio_media_clear_queue(), line 473; virtio_media_dqbuf(), line 976) and drivers/media/virtio/virtio_media_driver.c (virtio_media_session_alloc(), line 65), can a thread blocked in virtio_media_dqbuf() hang indefinitely when streaming is stopped, or block unexpectedly in non-blocking mode?

When virtio_media_clear_queue() stops streaming on VIDIOC_STREAMOFF or VIDIOC_REQBUFS(0), it sets queue->streaming = false and clears pending_dqbufs, but it does not call wake_up(&session->dqbuf_wait), and wait_event_interruptible() in virtio_media_dqbuf() only checks !list_empty(buffer_queue) || session->error (not !queue->streaming), leaving blocked VIDIOC_DQBUF callers asleep forever.

In addition, when session->nonblocking_dequeue is true in virtio_media_dqbuf():
- the else-if chain skips the queue->allocated_bufs == 0 and !queue->streaming checks, returning -EAGAIN instead of -EINVAL;
- if buffer_queue is non-empty, virtio_media_dqbuf() still drops vv->vlock and enters wait_event_interruptible(), where a racing consumer can empty the queue and cause a non-blocking call to sleep (or return -EIO if another thread dequeues the buffer before vv->vlock is re-acquired);
- session->nonblocking_dequeue is only snapshotted at open() time in virtio_media_session_alloc(), ignoring later fcntl(F_SETFL, O_NONBLOCK) changes to file->f_flags.

[Severity: High]
In drivers/media/virtio/virtio_media_ioctls.c (virtio_media_send_buffer_ioctl(), line 269; virtio_media_dqbuf(), line 1029) and drivers/media/virtio/scatterlist_builder.c (scatterlist_builder_retrieve_buffer(), line 416), can overwriting b->length in virtio_media_dqbuf() and virtio_media_send_buffer_ioctl() trigger an out-of-bounds kernel read when copying planes back to userspace?

In drivers/media/v4l2-core/v4l2-ioctl.c, check_array_args() allocates the kernel plane array b->m.planes (array_buf) sized to the caller's input b->length. virtio_media_dqbuf() copies min_t(u32, b->length, VIDEO_MAX_PLANES) planes into b->m.planes, and then memcpy(b, &dqbuf->buffer, sizeof(*b)) overwrites b->length with dqbuf->buffer.length (and virtio_media_send_buffer_ioctl() similarly lets the host response overwrite b->length). If the caller passed a smaller b->length (for example, 1 plane on a 2-plane format) via a 32-bit compat ioctl, v4l2_compat_put_array_args() in drivers/media/v4l2-core/v4l2-compat-ioctl32.c iterates over the overwritten b->length and reads past the end of array_buf, leaking adjacent kernel heap memory to userspace.

Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=4
#9 lore raw

PATCH v11 5/6 media: virtio: Add MMAP buffer mapping support

In reply to Brian Daniels

From: Alexandre Courbot <[email protected]>

Support mapping V4L2_MEMORY_MMAP buffers into guest userspace through virtio shared memory region 0.

Query the shared memory region during device probe and implement the mmap file operation and VMA close callback using VIRTIO_MEDIA_CMD_MMAP and VIRTIO_MEDIA_CMD_MUNMAP, remapping the host-provided shared memory offset into userspace via io_remap_pfn_range().

---
 drivers/media/virtio/session.h             |  14 +-
 drivers/media/virtio/virtio_media.h        |  13 +-
 drivers/media/virtio/virtio_media_driver.c | 159 +++++++++++++++++++++
 include/uapi/linux/virtio_media.h          |  67 +++++++++
 4 files changed, 243 insertions(+), 10 deletions(-)
drivers/media/virtio/session.h +8 -6
index 16bb86bf4..c074ffc2c 100644
@@ -63,12 +63,12 @@ struct virtio_media_queue_state {
  * @nonblocking_dequeue: whether dequeue should block or not (nonblocking if
  *                       file opened with O_NONBLOCK).
  * @uses_mplane: whether the queues for this session use the MPLANE API or not.
- * @cmd: union of session commands ``close`` and ``ioctl``. A session can have
- *       one command currently running. The rest of the commands are handled by
- *       &struct virtio_media.
- * @resp: union of responses to session commands. A session can wait on one
- *        command only. The rest of the responses are handled by
- *        &struct virtio_media.
+ * @cmd: union of session commands ``close``, ``ioctl``, and ``mmap``. A
+ *       session can have one command currently running. The rest of the
+ *       commands are handled by &struct virtio_media.
+ * @resp: union of responses to session commands ``close``, ``ioctl``, and
+ *        ``mmap``. A session can wait on one command only. The rest of the
+ *        responses are handled by &struct virtio_media.
  * @shadow_buf: shadow buffer where data to be added to the descriptor chain can
  *              be staged before being sent to the device.
  * @command_sgs: SG table gathering descriptors for a given command and its
@@ -91,10 +91,12 @@ struct virtio_media_session {
 	union {
 		struct virtio_media_cmd_close close;
 		struct virtio_media_cmd_ioctl ioctl;
+		struct virtio_media_cmd_mmap mmap;
 	} cmd;
 
 	union {
 		struct virtio_media_resp_ioctl ioctl;
+		struct virtio_media_resp_mmap mmap;
 	} resp;
 	__dma_from_device_group_end();
 
drivers/media/virtio/virtio_media.h +9 -4
index 8b21c1941..7acb2b842 100644
@@ -26,14 +26,15 @@
  * @commandq: virtio command queue.
  * @eventq: virtio event queue.
  * @eventq_work: work to run when events are received on @eventq.
+ * @mmap_region: region into which MMAP buffers are mapped by the host.
  * @event_buffer: buffer for event descriptors.
  * @sessions: list of active sessions on the device.
  * @sessions_lock: protects @sessions and &struct virtio_media_session.list.
  * @events_lock: prevents concurrent processing of events.
- * @cmd: union of device-level commands. Session commands are handled by
- *       &struct virtio_media_session.
- * @resp: union of responses to device-level commands. Session responses are
- *        handled by &struct virtio_media_session.
+ * @cmd: union of the device commands ``open`` and ``munmap``. The other
+ *       commands are handled by &struct virtio_media_session
+ * @resp: union of responses to device commands ``open`` and ``munmap``. The
+ *        other responses are handled by &struct virtio_media_session
  * @vlock: serializes access to the command queue.
  * @wq: waitqueue for host responses on the command queue.
  */
@@ -46,6 +47,8 @@ struct virtio_media {
 	struct virtqueue *eventq;
 	struct work_struct eventq_work;
 
+	struct virtio_shm_region mmap_region;
+
 	void *event_buffer;
 
 	struct list_head sessions;
@@ -56,10 +59,12 @@ struct virtio_media {
 	__dma_from_device_group_begin();
 	union {
 		struct virtio_media_cmd_open open;
+		struct virtio_media_cmd_munmap munmap;
 	} cmd;
 
 	union {
 		struct virtio_media_resp_open open;
+		struct virtio_media_resp_munmap munmap;
 	} resp;
 	__dma_from_device_group_end();
 
drivers/media/virtio/virtio_media_driver.c +159 -0

195 lines not on this page · raw message

include/uapi/linux/virtio_media.h +67 -0

73 lines not on this page · raw message

Signature · 1 line
2.56.1.750.gf70dc682cf-goog
#10 lore raw

Re: [PATCH v11 5/6] media: virtio: Add MMAP buffer mapping support

Thank you for your contribution! Sashiko AI review found 8 potential issues to consider: - [High] media: virtio: missing vm_ops->open() and pgoff corruption in vma close - [High] media: virtio…

Thank you for your contribution! Sashiko AI review found 8 potential issues to consider:
- [High] media: virtio: missing vm_ops->open() and pgoff corruption in vma close
- [High] media: virtio: use-after-free of commandq in virtio_media_vma_close()
- [High] media: virtio: mmap_lock and vlock inversion in virtio_media_device_mmap()
- [High] media: virtio: use-after-free in virtio_media_vma_close() after remove
- [Medium] media: virtio: missing SHM bounds check in virtio_media_device_mmap()
- [Medium] media: virtio: VM_MAYWRITE left set on RO mapping in virtio_media_device_mmap()
- [Medium] media: virtio: TOCTOU race on session->error in virtio_media_device_mmap()
- [Low] media: virtio: 32-bit offset truncation in virtio_media_device_mmap()
--

commit ca0abfda91649fedfc5e57137d16c8a739721fdb
Author: Alexandre Courbot <[email protected]>

media: virtio: Add MMAP buffer mapping support

This commit adds V4L2_MEMORY_MMAP buffer mapping support to the virtio-media driver by querying shared memory region 0 during probe and implementing mmap and VMA close callbacks using VIRTIO_MEDIA_CMD_MMAP and VIRTIO_MEDIA_CMD_MUNMAP.

Quoted 4 lines
drivers/media/virtio/virtio_media_driver.c +0 -0
index 7483577256bd0..eb6b31d7e370c 100644

[ ... ]

Quoted 20 lines
drivers/media/virtio/virtio_media_driver.c +16 -0
@@ -697,12 +705,155 @@ static __poll_t virtio_media_device_poll(struct file *file, poll_table *wait)
 	return rc;
 }
 
+static void virtio_media_vma_close_locked(struct vm_area_struct *vma)
+{
+	struct virtio_media *vv = vma->vm_private_data;
+	struct virtio_media_cmd_munmap *cmd_munmap = &vv->cmd.munmap;
+	struct virtio_media_resp_munmap *resp_munmap = &vv->resp.munmap;
+	struct scatterlist cmd_sg = {}, resp_sg = {};
+	struct scatterlist *sgs[2] = { &cmd_sg, &resp_sg };
+	int ret;
+
+	sg_set_buf(&cmd_sg, cmd_munmap, sizeof(*cmd_munmap));
+	sg_mark_end(&cmd_sg);
+
+	sg_set_buf(&resp_sg, resp_munmap, sizeof(*resp_munmap));
+	sg_mark_end(&resp_sg);
+
+	cmd_munmap->hdr.cmd = VIRTIO_MEDIA_CMD_MUNMAP;

drivers/media/virtio/virtio_media_driver.c static __poll_t virtio_media_device_poll(struct file *file, poll_table *wait) · line 733

Quoted 10 lines
drivers/media/virtio/virtio_media_driver.c +10 -0
+	cmd_munmap->hdr.__reserved = 0;
+	cmd_munmap->driver_addr =
+		(vma->vm_pgoff << PAGE_SHIFT) - vv->mmap_region.addr;
+	ret = virtio_media_send_command(vv, sgs, 1, 1, sizeof(*resp_munmap),
+					NULL);
+	if (ret < 0) {
+		v4l2_err(&vv->v4l2_dev, "host failed to unmap buffer: %d\n",
+			 ret);
+	}
+}

[Severity: High]
Can virtio_media_vma_close_locked() cause a use-after-free on vv->commandq if a mapping is unmapped after virtio_media_remove()?

An active VMA holds a reference on vma->vm_file, which keeps vv alive until all mappings are unmapped. If the device is removed while a buffer is mapped, virtio_media_remove() calls virtio_dev->config->del_vqs(virtio_dev), freeing vv->commandq. Unlike V4L2 file operations gated by video_is_registered(), the MM subsystem invokes vma->vm_ops->close() directly on munmap() or process exit, so virtio_media_send_command() dereferences the freed vv->commandq.

Quoted 6 lines
drivers/media/virtio/virtio_media_driver.c +6 -0
+
+/**
+ * virtio_media_vma_close() - Close a MMAP buffer mapping.
+ * @vma: VMA of the mapping to close.
+ *
+ * Inform the host that a previously created MMAP mapping is no longer needed

drivers/media/virtio/virtio_media_driver.c static __poll_t virtio_media_device_poll(struct file *file, poll_table *wait) · line 749

Quoted 10 lines
drivers/media/virtio/virtio_media_driver.c +10 -0
+ * and can be removed.
+ */
+static void virtio_media_vma_close(struct vm_area_struct *vma)
+{
+	struct virtio_media *vv = vma->vm_private_data;
+
+	mutex_lock(&vv->vlock);
+	virtio_media_vma_close_locked(vma);
+	mutex_unlock(&vv->vlock);
+}

[Severity: High]
When a mapped VMA outlives virtio_media_remove(), can closing that VMA trigger both a use-after-free on vv->commandq and a use-after-free and double free of the session?

drivers/media/virtio/virtio_media_driver.c:virtio_media_remove() {
	...
	/* Delete the virtqueues */
	virtio_dev->config->del_vqs(virtio_dev);

	mutex_unlock(&vv->vlock);

	list_for_each_safe(p, n, &vv->sessions) {
		struct virtio_media_session *s =
			list_entry(p, struct virtio_media_session, list);

		virtio_media_session_remove(vv, s);
		virtio_media_session_free(s);
	}
}

Because vma->vm_file pins the open struct file while the VMA exists, unmapping the VMA after virtio_media_remove() first calls virtio_media_vma_close(), which accesses the deleted vv->commandq, and then drops the final file reference via fput(vma->vm_file). That invokes v4l2_release() -> virtio_media_device_close(), which dereferences and frees the session in file->private_data that virtio_media_remove() already freed.

drivers/media/virtio/virtio_media_driver.c static __poll_t virtio_media_device_poll(struct file *file, poll_table *wait) · line 753

Quoted 4 lines
drivers/media/virtio/virtio_media_driver.c +4 -0
+
+static const struct vm_operations_struct virtio_media_vm_ops = {
+	.close = virtio_media_vma_close,
+};

[Severity: High]
Does omitting .open in virtio_media_vm_ops cause premature host unmapping and corrupted VIRTIO_MEDIA_CMD_MUNMAP offsets when a VMA is duplicated or split?

When a process with a mapped buffer calls fork(), moves the mapping with mremap(), or splits the VMA via partial munmap() or mprotect(), the kernel duplicates the VMA and calls vm_ops->open() without calling virtio_media_device_mmap(). With no .open callback or reference-counted mapping state in vma->vm_private_data (such as struct vb2_vmarea_handler), closing one VMA sends VIRTIO_MEDIA_CMD_MUNMAP to the host while the remaining VMA still maps those shared memory pages in guest userspace.

In addition, __split_vma() advances the upper VMA's vm_pgoff by the split offset, so when the upper half is later closed,
(vma->vm_pgoff << PAGE_SHIFT) - vv->mmap_region.addr computes an offset inside the buffer rather than the base driver_addr returned by VIRTIO_MEDIA_CMD_MMAP.

Quoted 19 lines
drivers/media/virtio/virtio_media_driver.c +19 -0
+
+/**
+ * virtio_media_device_mmap() - Perform a mmap request from userspace.
+ * @file: opened file of the session to map for.
+ * @vma: VM area struct describing the desired mapping.
+ *
+ * This requests the host to map a MMAP buffer for us, so we can then make that
+ * mapping visible into user-space address space.
+ */
+static int virtio_media_device_mmap(struct file *file,
+				    struct vm_area_struct *vma)
+{
+	struct video_device *video_dev = video_devdata(file);
+	struct virtio_media *vv = to_virtio_media(video_dev);
+	struct virtio_media_session *session =
+		fh_to_session(file->private_data);
+	struct virtio_media_cmd_mmap *cmd_mmap = &session->cmd.mmap;
+	struct virtio_media_resp_mmap *resp_mmap = &session->resp.mmap;
+	struct scatterlist cmd_sg = {}, resp_sg = {};

drivers/media/virtio/virtio_media_driver.c static __poll_t virtio_media_device_poll(struct file *file, poll_table *wait) · line 782

Quoted 10 lines
drivers/media/virtio/virtio_media_driver.c +10 -0
+	struct scatterlist *sgs[2] = { &cmd_sg, &resp_sg };
+	int ret;
+
+	mutex_lock(&session->error_lock);
+	bool session_error = session->error;
+
+	mutex_unlock(&session->error_lock);
+
+	if (session_error)
+		return -EIO;

[Severity: Medium]
Can a VIRTIO_MEDIA_EVT_ERROR event arriving before mutex_lock(&vv->vlock) cause virtio_media_device_mmap() to send VIRTIO_MEDIA_CMD_MMAP for an already closed session?

CPU0 (virtio_media_device_mmap) CPU1 (virtio_media_process_events)
mutex_lock(&session->error_lock)
session_error = session->error
mutex_unlock(&session->error_lock)

                                  mutex_lock(&session->error_lock)
                                  session->error = true
                                  mutex_unlock(&session->error_lock)
                                  virtio_media_session_close(vv, session)
                                    mutex_lock(&vv->vlock)
                                    /* sends VIRTIO_MEDIA_CMD_CLOSE */
                                    mutex_unlock(&vv->vlock)

mutex_lock(&vv->vlock)
/* sends VIRTIO_MEDIA_CMD_MMAP
on closed session->id */

Re-checking session->error after acquiring vv->vlock (or holding vv->vlock across the check) would prevent using session->id after VIRTIO_MEDIA_CMD_CLOSE.

drivers/media/virtio/virtio_media_driver.c static __poll_t virtio_media_device_poll(struct file *file, poll_table *wait) · line 788

Quoted 6 lines
drivers/media/virtio/virtio_media_driver.c +6 -0
+	if (!(vma->vm_flags & VM_SHARED))
+		return -EINVAL;
+	if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
+		return -EINVAL;
+
+	mutex_lock(&vv->vlock);

[Severity: High]
Does acquiring vv->vlock inside virtio_media_device_mmap() and virtio_media_vma_close() create an ABBA deadlock with mm->mmap_lock?

CPU0 CPU1
---- ----
lock(&mm->mmap_lock)

                                  lock(&vv->vlock)
lock(&vv->vlock)
                                  lock(&mm->mmap_lock)

*** DEADLOCK ***

CPU0: mmap_region() -> v4l2_mmap() -> virtio_media_device_mmap()

      (or remove_vma() -> virtio_media_vma_close())

CPU1: virtio_media_device_ioctl() -> copy_from_user() / video_ioctl2() /
pin_user_pages_fast()

virtio_media_device_ioctl() holds vv->vlock across user memory copies and pin_user_pages_fast(), which acquire mm->mmap_lock on page faults or the GUP slowpath, while mmap() and munmap() invoke virtio_media_device_mmap() and virtio_media_vma_close() with mm->mmap_lock already write-locked.

drivers/media/virtio/virtio_media_driver.c static __poll_t virtio_media_device_poll(struct file *file, poll_table *wait) · line 794

Quoted 6 lines
drivers/media/virtio/virtio_media_driver.c +6 -0
+
+	cmd_mmap->hdr.cmd = VIRTIO_MEDIA_CMD_MMAP;
+	cmd_mmap->hdr.__reserved = 0;
+	cmd_mmap->session_id = session->id;
+	cmd_mmap->flags =
+		(vma->vm_flags & VM_WRITE) ? VIRTIO_MEDIA_MMAP_FLAG_RW_MASK : 0;

[Severity: Medium]
When a buffer is mapped read-only on an O_RDWR file descriptor, can userspace later gain write access via mprotect() despite the host mapping being created without VIRTIO_MEDIA_MMAP_FLAG_RW_MASK?

For a shared mapping on an O_RDWR file, do_mmap() sets VM_MAYWRITE in vma->vm_flags even when PROT_WRITE was not requested. Because VM_MAYWRITE is left set when VM_WRITE is clear, a subsequent mprotect(..., PROT_READ | PROT_WRITE) installs writable guest PTEs backed by a read-only host shared memory mapping. Clearing VM_MAYWRITE via vm_flags_clear(vma, VM_MAYWRITE) on read-only mappings (or checking VM_MAYWRITE when setting cmd_mmap->flags) would prevent this mismatch.

drivers/media/virtio/virtio_media_driver.c static __poll_t virtio_media_device_poll(struct file *file, poll_table *wait) · line 795

Quoted 1 line
drivers/media/virtio/virtio_media_driver.c +1 -0
+	cmd_mmap->offset = vma->vm_pgoff << PAGE_SHIFT;

[Severity: Low]
Can a 64-bit file offset >= 4 GiB be silently truncated when assigned to the 32-bit cmd_mmap->offset?

On 64-bit kernels, vma->vm_pgoff << PAGE_SHIFT is 64 bits wide while cmd_mmap->offset is __le32, so an out-of-range mmap() offset wraps modulo 4 GiB and can alias a valid 32-bit plane mem_offset instead of failing with -EINVAL.

Quoted 30 lines
drivers/media/virtio/virtio_media_driver.c +30 -0
+	cmd_mmap->__reserved = 0;
+
+	sg_set_buf(&cmd_sg, cmd_mmap, sizeof(*cmd_mmap));
+	sg_mark_end(&cmd_sg);
+
+	sg_set_buf(&resp_sg, resp_mmap, sizeof(*resp_mmap));
+	sg_mark_end(&resp_sg);
+
+	/*
+	 * The host performs reference counting and is smart enough to return
+	 * the same guest physical address if this is called several times on
+	 * the same
+	 * buffer.
+	 */
+	ret = virtio_media_send_command(vv, sgs, 1, 1, sizeof(*resp_mmap),
+					NULL);
+	if (ret < 0)
+		goto end;
+
+	vma->vm_private_data = vv;
+	/*
+	 * Keep the guest address at which the buffer is mapped since we will
+	 * use that to unmap.
+	 */
+	vma->vm_pgoff = (resp_mmap->driver_addr + vv->mmap_region.addr) >>
+			PAGE_SHIFT;
+
+	/*
+	 * We cannot let the mapping be larger than the buffer.
+	 */

drivers/media/virtio/virtio_media_driver.c static __poll_t virtio_media_device_poll(struct file *file, poll_table *wait) · line 835

Quoted 10 lines
drivers/media/virtio/virtio_media_driver.c +10 -0
+	if (vma->vm_end - vma->vm_start > PAGE_ALIGN(resp_mmap->len)) {
+		dev_dbg(&video_dev->dev,
+			"invalid MMAP, as it would overflow buffer length\n");
+		ret = -EINVAL;
+		goto cleanup;
+	}
+
+	ret = io_remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
+				 vma->vm_end - vma->vm_start,
+				 vma->vm_page_prot);

[Severity: Medium]
Can an invalid or out-of-bounds resp_mmap->driver_addr cause io_remap_pfn_range() to remap guest physical memory outside vv->mmap_region?

virtio_media_device_mmap() does not check that resp_mmap->driver_addr and the mapped range fit within vv->mmap_region.len (without overflow), nor that resp_mmap->driver_addr is page-aligned before shifting it into vma->vm_pgoff. If the host returns an unaligned or out-of-range offset, io_remap_pfn_range() can map arbitrary guest physical addresses outside the shared memory region or lose the sub-page bits needed to pass the matching driver_addr back in VIRTIO_MEDIA_CMD_MUNMAP.

Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=5
#11 lore raw

PATCH v11 6/6 media: virtio: clear the size of legacy controls built on the stack

In reply to Brian Daniels

From: Nick Rogers <[email protected]>

A driver without a control handler receives VIDIOC_G_CTRL and VIDIOC_S_CTRL from the V4L2 core as a single extended control that the core builds on its own stack, with the control's size left uninitialized. virtio_media_send_ext_controls_ioctl() takes a nonzero size as a payload to copy from userspace, so these ioctls fail with -EINVAL whenever the stack is dirty. GStreamer's V4L2 encoders set their profile with VIDIOC_S_CTRL and cannot negotiate, and v4l2-ctl cannot read the MIN_BUFFERS controls.

Legacy controls carry a 32-bit value and never a payload, and an array that comes from userspace is copied into an allocation, never onto the stack. Clear the size of each control when the array is on the stack.

The core is being fixed to zero the structure [1]; this keeps the driver working on kernels without that fix.

[1] https://lore.kernel.org/all/[email protected]/

Assisted-by LLM
---
 drivers/media/virtio/virtio_media_ioctls.c | 25 ++++++++++++++++++++++
 1 file changed, 25 insertions(+)
drivers/media/virtio/virtio_media_ioctls.c +25 -0
index aa56efe9a..ad240073a 100644
@@ -6,6 +6,7 @@
  * Copyright (c) 2024-2026 Google LLC.
  */
 
+#include <linux/sched/task_stack.h>
 #include <linux/mutex.h>
 #include <linux/videodev2.h>
 #include <linux/virtio_config.h>
@@ -593,11 +594,31 @@ static int virtio_media_querycap(struct file *file, void *fh,
  * Extended control ioctls are handled mostly identically.
  */
 
+/*
+ * VIDIOC_G_CTRL and VIDIOC_S_CTRL reach a driver without a control handler
+ * as one extended control the V4L2 core builds on its own stack, with its
+ * size left uninitialized. They carry a 32-bit value and never a payload,
+ * so a size there is stack garbage, which would be sent as a user pointer
+ * to copy and fail the ioctl. An array from userspace is never on the
+ * stack: the core copies it into an allocation.
+ */
+static void virtio_media_legacy_ctrl(struct v4l2_ext_controls *ctrls)
+{
+	u32 i;
+
+	if (!ctrls->count || !object_is_on_stack(ctrls->controls))
+		return;
+	for (i = 0; i < ctrls->count; i++)
+		ctrls->controls[i].size = 0;
+}
+
 static int virtio_media_g_ext_ctrls(struct file *file, void *fh,
 				    struct v4l2_ext_controls *ctrls)
 {
 	struct v4l2_fh *vfh = file_to_v4l2_fh(file);
 
+	virtio_media_legacy_ctrl(ctrls);
+
 	return virtio_media_send_ext_controls_ioctl(vfh, VIDIOC_G_EXT_CTRLS,
 						    ctrls);
 }
@@ -607,6 +628,8 @@ static int virtio_media_s_ext_ctrls(struct file *file, void *fh,
 {
 	struct v4l2_fh *vfh = file_to_v4l2_fh(file);
 
+	virtio_media_legacy_ctrl(ctrls);
+
 	return virtio_media_send_ext_controls_ioctl(vfh, VIDIOC_S_EXT_CTRLS,
 						    ctrls);
 }
@@ -616,6 +639,8 @@ static int virtio_media_try_ext_ctrls(struct file *file, void *fh,
 {
 	struct v4l2_fh *vfh = file_to_v4l2_fh(file);
 
+	virtio_media_legacy_ctrl(ctrls);
+
 	return virtio_media_send_ext_controls_ioctl(vfh, VIDIOC_TRY_EXT_CTRLS,
 						    ctrls);
 }
Signature · 1 line
2.56.1.750.gf70dc682cf-goog
#12 lore raw

Re: [PATCH v11 6/6] media: virtio: clear the size of legacy controls built on the stack

Thank you for your contribution! Sashiko AI review found 1 potential issue to consider: - [Medium] media: virtio: incomplete stack initialization in virtio_media_legacy_ctrl() --

Thank you for your contribution! Sashiko AI review found 1 potential issue to consider:
- [Medium] media: virtio: incomplete stack initialization in virtio_media_legacy_ctrl()
--

commit d098c9e95ded482f86a03623164a3f51eaba79ca
Author: Nick Rogers <[email protected]>

media: virtio: clear the size of legacy controls built on the stack

This commit adds virtio_media_legacy_ctrl() to zero out the size field of stack-allocated v4l2_ext_control entries before forwarding extended control ioctls to the virtio host.

Quoted 4 lines
drivers/media/virtio/virtio_media_ioctls.c +0 -0
index aa56efe9a08c2..ad240073aec9f 100644

[ ... ]

Quoted 42 lines
drivers/media/virtio/virtio_media_ioctls.c +22 -0
@@ -593,11 +594,31 @@ static int virtio_media_querycap(struct file *file, void *fh,
  * Extended control ioctls are handled mostly identically.
  */
 
+/*
+ * VIDIOC_G_CTRL and VIDIOC_S_CTRL reach a driver without a control handler
+ * as one extended control the V4L2 core builds on its own stack, with its
+ * size left uninitialized. They carry a 32-bit value and never a payload,
+ * so a size there is stack garbage, which would be sent as a user pointer
+ * to copy and fail the ioctl. An array from userspace is never on the
+ * stack: the core copies it into an allocation.
+ */
+static void virtio_media_legacy_ctrl(struct v4l2_ext_controls *ctrls)
+{
+	u32 i;
+
+	if (!ctrls->count || !object_is_on_stack(ctrls->controls))
+		return;
+	for (i = 0; i < ctrls->count; i++)
+		ctrls->controls[i].size = 0;
+}
+
 static int virtio_media_g_ext_ctrls(struct file *file, void *fh,
 				    struct v4l2_ext_controls *ctrls)
 {
 	struct v4l2_fh *vfh = file_to_v4l2_fh(file);
 
+	virtio_media_legacy_ctrl(ctrls);
+
 	return virtio_media_send_ext_controls_ioctl(vfh, VIDIOC_G_EXT_CTRLS,
 						    ctrls);
 }
@@ -607,6 +628,8 @@ static int virtio_media_s_ext_ctrls(struct file *file, void *fh,
 {
 	struct v4l2_fh *vfh = file_to_v4l2_fh(file);
 
+	virtio_media_legacy_ctrl(ctrls);
+
 	return virtio_media_send_ext_controls_ioctl(vfh, VIDIOC_S_EXT_CTRLS,
 						    ctrls);
 }

drivers/media/virtio/virtio_media_ioctls.c static int virtio_media_try_ext_ctrls(struct file *file, void *fh, · line 646

Quoted 8 lines
drivers/media/virtio/virtio_media_ioctls.c +2 -0
@@ -616,6 +639,8 @@ static int virtio_media_try_ext_ctrls(struct file *file, void *fh,
 {
 	struct v4l2_fh *vfh = file_to_v4l2_fh(file);
 
+	virtio_media_legacy_ctrl(ctrls);
+
 	return virtio_media_send_ext_controls_ioctl(vfh, VIDIOC_TRY_EXT_CTRLS,
 						    ctrls);
 }

[Severity: Medium]
Does clearing only controls[i].size in virtio_media_legacy_ctrl() still leave other fields of ctrls and ctrls->controls[i] uninitialized on the stack?

In v4l_g_ctrl() and v4l_s_ctrl(), both struct v4l2_ext_controls ctrls and struct v4l2_ext_control ctrl are declared on the stack without zero-initialization, and only ctrls.which, ctrls.count, ctrls.controls, ctrl.id, and the 32-bit ctrl.value member are assigned (with check_ext_ctrls() clearing ctrls.reserved[0] and ctrl.reserved2[0]). That leaves ctrls->error_idx, ctrls->request_fd, struct padding, and the upper 32 bits of the 64-bit union in ctrl.value64 holding stack garbage when scatterlist_builder_add_ext_ctrls() sends both full structures to the host. In addition to leaking 16 bytes of guest kernel stack to the host on every VIDIOC_G_CTRL and VIDIOC_S_CTRL call, a VIDIOC_S_CTRL targeting a 64-bit host control will pass stack garbage in the upper 32 bits of ctrl.value64.

Also, VIDIOC_G_CTRL and VIDIOC_S_CTRL never call vidioc_try_ext_ctrls, so virtio_media_try_ext_ctrls() has no legacy stack-allocated caller. Rather than detecting stack pointers with object_is_on_stack() in the driver, could v4l_g_ctrl() and v4l_s_ctrl() in drivers/media/v4l2-core/v4l2-ioctl.c zero-initialize ctrls and ctrl directly?

Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=6