UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: [next] media: vidtv: fix a read from an object after it has been freed 

Currently the call to vidtv_psi_pat_table_destroy frees the object
m->si.pat however m->si.pat->num_pmt is being accessed after the
free.  Fix this by destroying m->si.pat after the m->si.pmt_secs[]
objects have been freed.

Addresses-Coverity: ("Read from pointer after free")

Reported-by: Cengiz Can <cengiz@kernel.wtf> # sent a similar fix about the same time

Fixes: 039b7caed1 ("media: vidtv: add a PID entry for the NIT table")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Colin Ian King 2020-11-27 14:28:32 +01:00 committed by Mauro Carvalho Chehab
parent bac63f1239
commit 3c0dde35e6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/test-drivers/vidtv/vidtv_channel.c
View File

@ -504,11 +504,11 @@ void vidtv_channel_si_destroy(struct vidtv_mux *m)
{ {
u32 i; u32 i;
vidtv_psi_pat_table_destroy(m->si.pat);
for (i = 0; i < m->si.pat->num_pmt; ++i) for (i = 0; i < m->si.pat->num_pmt; ++i)
vidtv_psi_pmt_table_destroy(m->si.pmt_secs[i]); vidtv_psi_pmt_table_destroy(m->si.pmt_secs[i]);
vidtv_psi_pat_table_destroy(m->si.pat);
kfree(m->si.pmt_secs); kfree(m->si.pmt_secs);
vidtv_psi_sdt_table_destroy(m->si.sdt); vidtv_psi_sdt_table_destroy(m->si.sdt);
vidtv_psi_nit_table_destroy(m->si.nit); vidtv_psi_nit_table_destroy(m->si.nit);