openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

V4L/DVB (13904): cx18: Fix TS and IDX stream buffer memory leak on module unload 

Fix a long standing memory leak of stream buffers for streams that did not
have a struct video_device allocated: namely the TS and IDX streams.

Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Andy Walls 2009-12-31 01:35:08 -03:00 committed by Mauro Carvalho Chehab
parent 540bab93b7
commit 7b1dde0331
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/video/cx18/cx18-queue.c
View File

@ -419,6 +419,9 @@ void cx18_stream_free(struct cx18_stream *s)
{ {
struct cx18_mdl *mdl; struct cx18_mdl *mdl;
struct cx18_buffer *buf; struct cx18_buffer *buf;
struct cx18 *cx = s->cx;
CX18_DEBUG_INFO("Deallocating buffers for %s stream\n", s->name);
/* move all buffers to buf_pool and all MDLs to q_idle */ /* move all buffers to buf_pool and all MDLs to q_idle */
cx18_unload_queues(s); cx18_unload_queues(s);

22
drivers/media/video/cx18/cx18-streams.c
View File

@ -319,11 +319,27 @@ void cx18_streams_cleanup(struct cx18 *cx, int unregister)
/* Teardown all streams */ /* Teardown all streams */
for (type = 0; type < CX18_MAX_STREAMS; type++) { for (type = 0; type < CX18_MAX_STREAMS; type++) {
if (cx->streams[type].dvb.enabled) {
cx18_dvb_unregister(&cx->streams[type]); /* No struct video_device, but can have buffers allocated */
cx->streams[type].dvb.enabled = false; if (type == CX18_ENC_STREAM_TYPE_TS) {
if (cx->streams[type].dvb.enabled) {
cx18_dvb_unregister(&cx->streams[type]);
cx->streams[type].dvb.enabled = false;
cx18_stream_free(&cx->streams[type]);
}
continue;
} }
/* No struct video_device, but can have buffers allocated */
if (type == CX18_ENC_STREAM_TYPE_IDX) {
if (cx->stream_buffers[type] != 0) {
cx->stream_buffers[type] = 0;
cx18_stream_free(&cx->streams[type]);
}
continue;
}
/* If struct video_device exists, can have buffers allocated */
vdev = cx->streams[type].video_dev; vdev = cx->streams[type].video_dev;
cx->streams[type].video_dev = NULL; cx->streams[type].video_dev = NULL;