Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b436f14 authored by Jiasheng Jiang's avatar Jiasheng Jiang Committed by Greg Kroah-Hartman
Browse files

media: coda: Add check for dcoda_iram_alloc 



[ Upstream commit 6b8082238fb8bb20f67e46388123e67a5bbc558d ]

As the coda_iram_alloc may return NULL pointer,
it should be better to check the return value
in order to avoid NULL poineter dereference,
same as the others.

Fixes: b313bcc9 ("[media] coda: simplify IRAM setup")
Signed-off-by: default avatarJiasheng Jiang <jiasheng@iscas.ac.cn>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 6250bc73

drivers/media/platform/coda/coda-bit.c

+2 −2
Original line number Diff line number Diff line
@@ -852,7 +852,7 @@ static void coda_setup_iram(struct coda_ctx *ctx) 
		/* Only H.264BP and H.263P3 are considered */

		iram_info->buf_dbk_y_use = coda_iram_alloc(iram_info, w64);

		iram_info->buf_dbk_c_use = coda_iram_alloc(iram_info, w64);

		if (!iram_info->buf_dbk_c_use)

		if (!iram_info->buf_dbk_y_use || !iram_info->buf_dbk_c_use)

			goto out;

		iram_info->axi_sram_use |= dbk_bits;
@@ -876,7 +876,7 @@ static void coda_setup_iram(struct coda_ctx *ctx) 


		iram_info->buf_dbk_y_use = coda_iram_alloc(iram_info, w128);

		iram_info->buf_dbk_c_use = coda_iram_alloc(iram_info, w128);

		if (!iram_info->buf_dbk_c_use)

		if (!iram_info->buf_dbk_y_use || !iram_info->buf_dbk_c_use)

			goto out;

		iram_info->axi_sram_use |= dbk_bits;