Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f890ab1 authored by Andy Walls's avatar Andy Walls Committed by Mauro Carvalho Chehab
Browse files

[media] cx18: Fix list BUG for IDX stream, triggerable in cx18_probe() error clean up, 



If allocating stream buffers for one of the primary streams (e.g. YUV)
failed during card probe, the error path clean up would try to manipulate
the yet unitialized IDX stream structures.  This caused a BUG due to
unitialized list heads.

Detect that case and ignore the uninitialized IDX stream.

Signed-off-by: default avatarAndy Walls <awalls@md.metrocast.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 974ceab8

drivers/media/video/cx18/cx18-streams.c

+9 −1
Original line number Diff line number Diff line
@@ -350,8 +350,16 @@ void cx18_streams_cleanup(struct cx18 *cx, int unregister) 


		/* No struct video_device, but can have buffers allocated */

		if (type == CX18_ENC_STREAM_TYPE_IDX) {

			/* If the module params didn't inhibit IDX ... */

			if (cx->stream_buffers[type] != 0) {

				cx->stream_buffers[type] = 0;

				/*

				 * Before calling cx18_stream_free(),

				 * check if the IDX stream was actually set up.

				 * Needed, since the cx18_probe() error path

				 * exits through here as well as normal clean up

				 */

				if (cx->streams[type].buffers != 0)

					cx18_stream_free(&cx->streams[type]);

			}

			continue;