]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
media: rcar-csi2: Add checking to rcsi2_start_receiver()
authorNadezda Lutovinova <lutovinova@ispras.ru>
Wed, 11 Aug 2021 17:18:16 +0000 (19:18 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 26 Nov 2021 10:36:05 +0000 (11:36 +0100)
[ 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

index dc5ae8025832ab6e629557b1fa860731a5dfd796..23f55514b002ab449037f3d95890bb3ee2cfd3d2 100644 (file)
@@ -474,6 +474,8 @@ static int rcsi2_start(struct rcar_csi2 *priv)
 
        /* Code is validated in set_fmt. */
        format = rcsi2_code_to_fmt(priv->mf.code);
+       if (!format)
+               return -EINVAL;
 
        /*
         * Enable all Virtual Channels.