| From fe8ca092e44fddef6d793fcf2278fc2bc6b5ec66 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 11 Aug 2021 19:18:16 +0200 |
| Subject: media: rcar-csi2: Add checking to rcsi2_start_receiver() |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Nadezda Lutovinova <lutovinova@ispras.ru> |
| |
| [ Upstream commit fc41665498332ad394b7db37f23e9394096ddc71 ] |
| |
| If rcsi2_code_to_fmt() return NULL, then null pointer dereference occurs |
| in the next cycle. That should not be possible now but adding checking |
| protects from future bugs. |
| The patch adds checking if format is NULL. |
| |
| Found by Linux Driver Verification project (linuxtesting.org). |
| |
| Signed-off-by: Nadezda Lutovinova <lutovinova@ispras.ru> |
| Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> |
| Reviewed-by: Niklas Sรถderlund <niklas.soderlund+renesas@ragnatech.se> |
| Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/media/platform/rcar-vin/rcar-csi2.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/drivers/media/platform/rcar-vin/rcar-csi2.c b/drivers/media/platform/rcar-vin/rcar-csi2.c |
| index d27eccfa57cae..e01f22bf826d4 100644 |
| --- a/drivers/media/platform/rcar-vin/rcar-csi2.c |
| +++ b/drivers/media/platform/rcar-vin/rcar-csi2.c |
| @@ -488,6 +488,8 @@ static int rcsi2_start_receiver(struct rcar_csi2 *priv) |
| |
| /* Code is validated in set_fmt. */ |
| format = rcsi2_code_to_fmt(priv->mf.code); |
| + if (!format) |
| + return -EINVAL; |
| |
| /* |
| * Enable all supported CSI-2 channels with virtual channel and |
| -- |
| 2.33.0 |
| |
