Commit 10b5ce67 authored by Luca Ceresoli's avatar Luca Ceresoli Committed by Hans Verkuil
Browse files

staging: media: tegra-video: fix chan->mipi value on error 



chan->mipi takes the return value of tegra_mipi_request() which can be a
valid pointer or an error. However chan->mipi is checked in several places,
including error-cleanup code in tegra_csi_channels_cleanup(), as 'if
(chan->mipi)', which suggests the initial intent was that chan->mipi should
be either NULL or a valid pointer, never an error. As a consequence,
cleanup code in case of tegra_mipi_request() errors would dereference an
invalid pointer.

Fix by ensuring chan->mipi always contains either NULL or a void pointer.

Also add that to the documentation.

Fixes: 523c857e ("media: tegra-video: Add CSI MIPI pads calibration")
Cc: stable@vger.kernel.org
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarLuca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 3a04d986

drivers/staging/media/tegra-video/csi.c

+1 −0
Original line number Diff line number Diff line
@@ -448,6 +448,7 @@ static int tegra_csi_channel_alloc(struct tegra_csi *csi, 
	chan->mipi = tegra_mipi_request(csi->dev, node);

	if (IS_ERR(chan->mipi)) {

		ret = PTR_ERR(chan->mipi);

		chan->mipi = NULL;

		dev_err(csi->dev, "failed to get mipi device: %d\n", ret);

	}

drivers/staging/media/tegra-video/csi.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ struct tegra_csi; 
 * @framerate: active framerate for TPG

 * @h_blank: horizontal blanking for TPG active format

 * @v_blank: vertical blanking for TPG active format

 * @mipi: mipi device for corresponding csi channel pads

 * @mipi: mipi device for corresponding csi channel pads, or NULL if not applicable (TPG, error)

 * @pixel_rate: active pixel rate from the sensor on this channel

 */

struct tegra_csi_channel {