Commit 36309019 authored by Ricardo Ribalda's avatar Ricardo Ribalda Committed by Mauro Carvalho Chehab
Browse files

media: staging/intel-ipu3: Fix memory leak in imu_fmt 



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: 6d5f26f2 ("media: staging/intel-ipu3-v4l: reduce kernel stack usage")
Signed-off-by: default avatarRicardo Ribalda <ribalda@chromium.org>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 41033690

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

+7 −4
Original line number Diff line number Diff line
@@ -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) {