Commit f30ce3d3 authored by 蒋家盛's avatar 蒋家盛 Committed by Hans Verkuil
Browse files

media: coda: jpeg: Add check for kmalloc 



As kmalloc can return NULL pointer, it should be better to
check the return value and return error, same as
coda_jpeg_decode_header.

Fixes: 96f6f62c ("media: coda: jpeg: add CODA960 JPEG encoder support")
Signed-off-by: default avatarJiasheng Jiang <jiasheng@iscas.ac.cn>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent b6bcdf76

drivers/media/platform/chips-media/coda-jpeg.c

+8 −2
Original line number Diff line number Diff line
@@ -1052,10 +1052,16 @@ static int coda9_jpeg_start_encoding(struct coda_ctx *ctx) 
		v4l2_err(&dev->v4l2_dev, "error loading Huffman tables\n");

		return ret;

	}

	if (!ctx->params.jpeg_qmat_tab[0])

	if (!ctx->params.jpeg_qmat_tab[0]) {

		ctx->params.jpeg_qmat_tab[0] = kmalloc(64, GFP_KERNEL);

	if (!ctx->params.jpeg_qmat_tab[1])

		if (!ctx->params.jpeg_qmat_tab[0])

			return -ENOMEM;

	}

	if (!ctx->params.jpeg_qmat_tab[1]) {

		ctx->params.jpeg_qmat_tab[1] = kmalloc(64, GFP_KERNEL);

		if (!ctx->params.jpeg_qmat_tab[1])

			return -ENOMEM;

	}

	coda_set_jpeg_compression_quality(ctx, ctx->params.jpeg_quality);



	return 0;