diff options
| author | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2023-10-06 12:08:50 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2023-10-13 11:33:22 +0200 |
| commit | 65b8c8cb2bf5f5676b5f0628a455c2982aa09683 (patch) | |
| tree | e77da343ab61c04716c6ca9c6ae4352cde39aeb6 /drivers/media/pci | |
| parent | ada092e80c1031208df7366c7d3798d1e7d1904a (diff) | |
| download | linux-stable-65b8c8cb2bf5f5676b5f0628a455c2982aa09683.tar.gz linux-stable-65b8c8cb2bf5f5676b5f0628a455c2982aa09683.tar.bz2 linux-stable-65b8c8cb2bf5f5676b5f0628a455c2982aa09683.zip | |
media: pci: mgb4: fix potential spectre vulnerability
Fix smatch warnings:
drivers/media/pci/mgb4/mgb4_sysfs_out.c:118 video_source_store() warn: potential spectre issue 'mgbdev->vin' [r] (local cap)
drivers/media/pci/mgb4/mgb4_sysfs_out.c:122 video_source_store() warn: possible spectre second half. 'loopin_new'
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Reviewed-by: Martin Tůma <martin.tuma@digiteqautomotive.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Diffstat (limited to 'drivers/media/pci')
| -rw-r--r-- | drivers/media/pci/mgb4/mgb4_sysfs_out.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/pci/mgb4/mgb4_sysfs_out.c b/drivers/media/pci/mgb4/mgb4_sysfs_out.c index 23a9aabf3915..9f6e81c57726 100644 --- a/drivers/media/pci/mgb4/mgb4_sysfs_out.c +++ b/drivers/media/pci/mgb4/mgb4_sysfs_out.c @@ -8,6 +8,7 @@ */ #include <linux/device.h> +#include <linux/nospec.h> #include "mgb4_core.h" #include "mgb4_i2c.h" #include "mgb4_vout.h" @@ -114,8 +115,10 @@ static ssize_t video_source_store(struct device *dev, if (((config & 0xc) >> 2) < MGB4_VIN_DEVICES) loopin_old = mgbdev->vin[(config & 0xc) >> 2]; - if (val < MGB4_VIN_DEVICES) + if (val < MGB4_VIN_DEVICES) { + val = array_index_nospec(val, MGB4_VIN_DEVICES); loopin_new = mgbdev->vin[val]; + } if (loopin_old && loopin_cnt(loopin_old) == 1) mgb4_mask_reg(&mgbdev->video, loopin_old->config->regs.config, 0x2, 0x0); |