mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-10 07:59:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

media: vivid: fix potential integer overflow on left shift

Browse Source 
There is a potential integer overflow when int 2 is left shifted
as this is evaluated using 32 bit arithmetic but is being used in
a context that expects an expression of type s64.  Fix this by
generating a mask using GENMASK to avoid a 32 bit overflow.

Addresses-Coverity: ("Unintentional integer overflow")

Fixes: 8a99e9faa1 ("media: vivid: add HDMI (dis)connect RX emulation")
Fixes: 79a792dafa ("media: vivid: add HDMI (dis)connect TX emulation")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Colin Ian King
2019-06-27 04:05:41 -04:00
committed by Mauro Carvalho Chehab
parent b61789f53d
commit b98fd3cb6d
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/media/platform/vivid/vivid-ctrls.c
View File

@@ -1613,6 +1613,8 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,
}
if (dev->num_hdmi_inputs) {
s64 hdmi_input_mask = GENMASK(dev->num_hdmi_inputs - 1, 0);
dev->ctrl_dv_timings_signal_mode = v4l2_ctrl_new_custom(hdl_vid_cap,
&vivid_ctrl_dv_timings_signal_mode, NULL);
@@ -1633,12 +1635,13 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,
V4L2_CID_DV_RX_RGB_RANGE, V4L2_DV_RGB_RANGE_FULL,
0, V4L2_DV_RGB_RANGE_AUTO);
dev->ctrl_rx_power_present = v4l2_ctrl_new_std(hdl_vid_cap,
NULL, V4L2_CID_DV_RX_POWER_PRESENT, 0,
(2 << (dev->num_hdmi_inputs - 1)) - 1, 0,
(2 << (dev->num_hdmi_inputs - 1)) - 1);
NULL, V4L2_CID_DV_RX_POWER_PRESENT, 0, hdmi_input_mask,
0, hdmi_input_mask);
}
if (dev->num_hdmi_outputs) {
s64 hdmi_output_mask = GENMASK(dev->num_hdmi_outputs - 1, 0);
/*
* We aren't doing anything with this at the moment, but
* HDMI outputs typically have this controls.
@@ -1652,17 +1655,14 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,
dev->ctrl_display_present = v4l2_ctrl_new_custom(hdl_vid_out,
&vivid_ctrl_display_present, NULL);
dev->ctrl_tx_hotplug = v4l2_ctrl_new_std(hdl_vid_out,
NULL, V4L2_CID_DV_TX_HOTPLUG, 0,
(2 << (dev->num_hdmi_outputs - 1)) - 1, 0,
(2 << (dev->num_hdmi_outputs - 1)) - 1);
NULL, V4L2_CID_DV_TX_HOTPLUG, 0, hdmi_output_mask,
0, hdmi_output_mask);
dev->ctrl_tx_rxsense = v4l2_ctrl_new_std(hdl_vid_out,
NULL, V4L2_CID_DV_TX_RXSENSE, 0,
(2 << (dev->num_hdmi_outputs - 1)) - 1, 0,
(2 << (dev->num_hdmi_outputs - 1)) - 1);
NULL, V4L2_CID_DV_TX_RXSENSE, 0, hdmi_output_mask,
0, hdmi_output_mask);
dev->ctrl_tx_edid_present = v4l2_ctrl_new_std(hdl_vid_out,
NULL, V4L2_CID_DV_TX_EDID_PRESENT, 0,
(2 << (dev->num_hdmi_outputs - 1)) - 1, 0,
(2 << (dev->num_hdmi_outputs - 1)) - 1);
NULL, V4L2_CID_DV_TX_EDID_PRESENT, 0, hdmi_output_mask,
0, hdmi_output_mask);
}
if ((dev->has_vid_cap && dev->has_vid_out) ||
(dev->has_vbi_cap && dev->has_vbi_out))