linux-kernel - [PATCH] media: staging: rkisp1: cap: fix timeout when stopping the stream

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20201106230236.1884387-1-helen.koike@collabora.com>
Date:   Fri,  6 Nov 2020 20:02:36 -0300
From:   Helen Koike <helen.koike@...labora.com>
To:     linux-media@...r.kernel.org
Cc:     linux-rockchip@...ts.infradead.org, linux-kernel@...r.kernel.org,
        heiko@...ech.de, kernel@...labora.com, hverkuil-cisco@...all.nl,
        dafna.hirschfeld@...labora.com, zhengsq@...k-chips.com,
        laurent.pinchart@...asonboard.com, niklas.soderlund@...natech.se,
        mchehab@...nel.org, tfiga@...omium.org, ribalda@...gle.com
Subject: [PATCH] media: staging: rkisp1: cap: fix timeout when stopping the stream

The dma engine should be stopped first.
The driver waits for an interrupt to stop the stream in a known state
after a frame.
If rkisp1_cap_stream_disable() is called after stopping the rest of the
pipeline, then most likely the interrupt won't arrive, we'll get a
timeout and debugfs variables mp_stop_timeout or sp_stop_timeout will
be incremented.

Fixes: 37db540bb9d1f ("media: staging: rkisp1: cap: refactor enable/disable stream to allow multistreaming")
Signed-off-by: Helen Koike <helen.koike@...labora.com>
---
 drivers/staging/media/rkisp1/rkisp1-capture.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/media/rkisp1/rkisp1-capture.c b/drivers/staging/media/rkisp1/rkisp1-capture.c
index 6d2fd27970f28..b81235afd0534 100644
--- a/drivers/staging/media/rkisp1/rkisp1-capture.c
+++ b/drivers/staging/media/rkisp1/rkisp1-capture.c
@@ -895,6 +895,8 @@ static void rkisp1_pipeline_stream_disable(struct rkisp1_capture *cap)
 {
 	struct rkisp1_device *rkisp1 = cap->rkisp1;
 
+	rkisp1_cap_stream_disable(cap);
+
 	/*
 	 * If the other capture is streaming, isp and sensor nodes shouldn't
 	 * be disabled, skip them.
@@ -907,8 +909,6 @@ static void rkisp1_pipeline_stream_disable(struct rkisp1_capture *cap)
 
 	v4l2_subdev_call(&rkisp1->resizer_devs[cap->id].sd, video, s_stream,
 			 false);
-
-	rkisp1_cap_stream_disable(cap);
 }
 
 /*
-- 
2.29.2