Unverified Commit 15e3c9ba authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15369 media: vidtv: Fix a null-ptr-deref in vidtv_mux_stop_thread 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Kai <liukai284@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/ZUB3YSVBSXPHTLODDMOP6Y4S24MM64DD/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBPC66 
 
Link:https://gitee.com/openeuler/kernel/pulls/15369

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 304c7f18 01e061f8

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

+7 −1
Original line number Diff line number Diff line
@@ -191,10 +191,11 @@ static int vidtv_start_streaming(struct vidtv_dvb *dvb) 


	mux_args.mux_buf_sz  = mux_buf_sz;



	dvb->streaming = true;

	dvb->mux = vidtv_mux_init(dvb->fe[0], dev, &mux_args);

	if (!dvb->mux)

		return -ENOMEM;



	dvb->streaming = true;

	vidtv_mux_start_thread(dvb->mux);



	dev_dbg_ratelimited(dev, "Started streaming\n");
@@ -205,6 +206,11 @@ static int vidtv_stop_streaming(struct vidtv_dvb *dvb) 
{

	struct device *dev = &dvb->pdev->dev;



	if (!dvb->streaming) {

		dev_warn_ratelimited(dev, "No streaming. Skipping.\n");

		return 0;

	}



	dvb->streaming = false;

	vidtv_mux_stop_thread(dvb->mux);

	vidtv_mux_destroy(dvb->mux);