Unverified Commit 3860532a authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8041 media: vidtv: mux: Add check and kfree for kstrdup 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zeng Heng <zengheng4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/O5NDWXRUF5UR5HCGZY7ARZURI4EZX7FV/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9RE9O 
 
Link:https://gitee.com/openeuler/kernel/pulls/8041

 

Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 50f70f2d 0e77060f

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

+6 −1
Original line number Diff line number Diff line
@@ -504,13 +504,16 @@ struct vidtv_mux *vidtv_mux_init(struct dvb_frontend *fe, 
	m->priv = args->priv;

	m->network_id = args->network_id;

	m->network_name = kstrdup(args->network_name, GFP_KERNEL);

	if (!m->network_name)

		goto free_mux_buf;



	m->timing.current_jiffies = get_jiffies_64();



	if (args->channels)

		m->channels = args->channels;

	else

		if (vidtv_channels_init(m) < 0)

			goto free_mux_buf;

			goto free_mux_network_name;



	/* will alloc data for pmt_sections after initializing pat */

	if (vidtv_channel_si_init(m) < 0)
@@ -527,6 +530,8 @@ struct vidtv_mux *vidtv_mux_init(struct dvb_frontend *fe, 
	vidtv_channel_si_destroy(m);

free_channels:

	vidtv_channels_destroy(m);

free_mux_network_name:

	kfree(m->network_name);

free_mux_buf:

	vfree(m->mux_buf);

free_mux: