Skip to content

Commit

Permalink
V4L/DVB (13904): cx18: Fix TS and IDX stream buffer memory leak on mo…
Browse files Browse the repository at this point in the history
…dule 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>
  • Loading branch information
Andy Walls authored and Mauro Carvalho Chehab committed Feb 26, 2010
1 parent 540bab9 commit 7b1dde0
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 3 deletions.
3 changes: 3 additions & 0 deletions drivers/media/video/cx18/cx18-queue.c
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,9 @@ void cx18_stream_free(struct cx18_stream *s)
{
struct cx18_mdl *mdl;
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 */
cx18_unload_queues(s);
Expand Down
22 changes: 19 additions & 3 deletions drivers/media/video/cx18/cx18-streams.c
Original file line number Diff line number Diff line change
Expand Up @@ -319,11 +319,27 @@ void cx18_streams_cleanup(struct cx18 *cx, int unregister)

/* Teardown all streams */
for (type = 0; type < CX18_MAX_STREAMS; type++) {
if (cx->streams[type].dvb.enabled) {
cx18_dvb_unregister(&cx->streams[type]);
cx->streams[type].dvb.enabled = false;

/* No struct video_device, but can have buffers allocated */
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;

cx->streams[type].video_dev = NULL;
Expand Down

0 comments on commit 7b1dde0

Please sign in to comment.