From 3630901933afba1d16c462b04d569b7576339223 Mon Sep 17 00:00:00 2001

From: Ricardo Ribalda <ribalda@chromium.org>

Date: Mon, 15 Mar 2021 13:34:05 +0100

Subject: [PATCH] media: staging/intel-ipu3: Fix memory leak in imu_fmt

Git-commit: 3630901933afba1d16c462b04d569b7576339223

Patch-mainline: v5.13-rc1

References: git-fixes

We are losing the reference to an allocated memory if try. Change the

order of the check to avoid that.

Cc: stable@vger.kernel.org

Fixes: 6d5f26f2e045 ("media: staging/intel-ipu3-v4l: reduce kernel stack usage")

Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/staging/media/ipu3/ipu3-v4l2.c | 11 +++++++----

 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/media/ipu3/ipu3-v4l2.c b/drivers/staging/media/ipu3/ipu3-v4l2.c

index e8944e489c56..9e8980b34547 100644

--- a/drivers/staging/media/ipu3/ipu3-v4l2.c

+++ b/drivers/staging/media/ipu3/ipu3-v4l2.c

@@ -694,6 +694,13 @@ static int imgu_fmt(struct imgu_device *imgu, unsigned int pipe, int node,

 		if (inode == IMGU_NODE_STAT_3A || inode == IMGU_NODE_PARAMS)

 			continue;

+		/* CSS expects some format on OUT queue */

+		if (i != IPU3_CSS_QUEUE_OUT &&

+		    !imgu_pipe->nodes[inode].enabled) {

+			fmts[i] = NULL;

+			continue;

+		}

+

 		if (try) {

 			fmts[i] = kmemdup(&imgu_pipe->nodes[inode].vdev_fmt.fmt.pix_mp,

 					  sizeof(struct v4l2_pix_format_mplane),

@@ -706,10 +713,6 @@ static int imgu_fmt(struct imgu_device *imgu, unsigned int pipe, int node,

 			fmts[i] = &imgu_pipe->nodes[inode].vdev_fmt.fmt.pix_mp;

 		}

-		/* CSS expects some format on OUT queue */

-		if (i != IPU3_CSS_QUEUE_OUT &&

-		    !imgu_pipe->nodes[inode].enabled)

-			fmts[i] = NULL;

 	}

 	if (!try) {

-- 

2.26.2