Commit e6a21a14 authored by 蒋家盛's avatar 蒋家盛 Committed by Mauro Carvalho Chehab
Browse files

media: vidtv: Check for null return of vzalloc 



As the possible failure of the vzalloc(), e->encoder_buf might be NULL.
Therefore, it should be better to check it in order
to guarantee the success of the initialization.
If fails, we need to free not only 'e' but also 'e->name'.
Also, if the allocation for ctx fails, we need to free 'e->encoder_buf'
else.

Fixes: f90cf607 ("media: vidtv: add a bridge driver")
Signed-off-by: default avatarJiasheng Jiang <jiasheng@iscas.ac.cn>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 479f4a6e

drivers/media/test-drivers/vidtv/vidtv_s302m.c

+13 −4
Original line number Diff line number Diff line
@@ -455,6 +455,9 @@ struct vidtv_encoder 
		e->name = kstrdup(args.name, GFP_KERNEL);



	e->encoder_buf = vzalloc(VIDTV_S302M_BUF_SZ);

	if (!e->encoder_buf)

		goto out_kfree_e;



	e->encoder_buf_sz = VIDTV_S302M_BUF_SZ;

	e->encoder_buf_offset = 0;
@@ -467,10 +470,8 @@ struct vidtv_encoder 
	e->is_video_encoder = false;



	ctx = kzalloc(priv_sz, GFP_KERNEL);

	if (!ctx) {

		kfree(e);

		return NULL;

	}

	if (!ctx)

		goto out_kfree_buf;



	e->ctx = ctx;

	ctx->last_duration = 0;
@@ -498,6 +499,14 @@ struct vidtv_encoder 
	e->next = NULL;



	return e;



out_kfree_buf:

	kfree(e->encoder_buf);



out_kfree_e:

	kfree(e->name);

	kfree(e);

	return NULL;

}



void vidtv_s302m_encoder_destroy(struct vidtv_encoder *e)