v4l: vsp1: Fix crash when resetting pipeline

commit d69e40fade97b6b19837c1772efa516bc28cc870 upstream.

The vsp1_pipeline_reset() function loops over pipeline inputs and output
and resets them. When doing so it assumes both that the pipeline has
been correctly configured with an output, and that inputs are are stored
in the pipe inputs array at positions 0 to num_inputs-1.

Both the assumptions are incorrect. The pipeline might need to be reset
after a failed attempts to configure it, without any output specified.
Furthermore, inputs are stored in a positiong equal to their RPF index,
possibly creating holes in the inputs array if the RPFs are not used in
sequence.

Fix both issues by looping over the whole inputs array and skipping
unused entries, and ignoring the output when not set.

Fixes: ff7e97c94d9f ("[media] v4l: vsp1: Store pipeline pointer in rwpf")
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/media/platform/vsp1/vsp1_pipe.c b/drivers/media/platform/vsp1/vsp1_pipe.c
index 4f3b4a1d028a76810cbf515e6da0146ae20868dc..3c8f40bd8b9d957f02f911ac683508ad19ed90b8 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_pipe.c
+++ b/drivers/media/platform/vsp1/vsp1_pipe.c
@@ -172,13 +172,17 @@ void vsp1_pipeline_reset(struct vsp1_pipeline *pipe)
                        bru->inputs[i].rpf = NULL;
        }
 
-       for (i = 0; i < pipe->num_inputs; ++i) {
-               pipe->inputs[i]->pipe = NULL;
-               pipe->inputs[i] = NULL;
+       for (i = 0; i < ARRAY_SIZE(pipe->inputs); ++i) {
+               if (pipe->inputs[i]) {
+                       pipe->inputs[i]->pipe = NULL;
+                       pipe->inputs[i] = NULL;
+               }
        }
 
-       pipe->output->pipe = NULL;
-       pipe->output = NULL;
+       if (pipe->output) {
+               pipe->output->pipe = NULL;
+               pipe->output = NULL;
+       }
 
        INIT_LIST_HEAD(&pipe->entities);
        pipe->state = VSP1_PIPELINE_STOPPED;