linux-kernel - [PATCH] media: amphion: check and cancel vpu before release

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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <afd6674a68c02d25cdd57a70db8135217c70a358.1667289237.git.ming.qian@nxp.com>
Date:   Tue,  1 Nov 2022 16:05:51 +0800
From:   Ming Qian <ming.qian@....com>
To:     mchehab@...nel.org, hverkuil-cisco@...all.nl
Cc:     shawnguo@...nel.org, robh+dt@...nel.org, s.hauer@...gutronix.de,
        kernel@...gutronix.de, festevam@...il.com, linux-imx@....com,
        xiahong.bao@....com, linux-media@...r.kernel.org,
        linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org
Subject: [PATCH] media: amphion: check and cancel vpu before release

driver need to cancel vpu before releasing the vpu instance,
but it doesn't want to release the m2m_ctx before
the release callback of instance is called,
as driver may access the m2m_ctx in handling some event
which may be received in releasing instance.

check and cancel the unstopped instance before release.

Fixes: d91d7bc85062 ("media: amphion: release m2m ctx when releasing vpu instance")
Signed-off-by: Ming Qian <ming.qian@....com>
---
 drivers/media/platform/amphion/vpu_v4l2.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/drivers/media/platform/amphion/vpu_v4l2.c b/drivers/media/platform/amphion/vpu_v4l2.c
index 99ad2f1c5a53..845fc53d8937 100644
--- a/drivers/media/platform/amphion/vpu_v4l2.c
+++ b/drivers/media/platform/amphion/vpu_v4l2.c
@@ -767,6 +767,23 @@ int vpu_v4l2_open(struct file *file, struct vpu_inst *inst)
 	return ret;
 }
 
+static void vpu_v4l2_check_and_cancel(struct file *file, struct vpu_inst *inst)
+{
+	struct vb2_queue *vq;
+
+	vpu_inst_lock(inst);
+
+	vq = v4l2_m2m_get_src_vq(inst->fh.m2m_ctx);
+	if (vb2_is_streaming(vq))
+		v4l2_m2m_streamoff(file, inst->fh.m2m_ctx, vq->type);
+
+	vq = v4l2_m2m_get_dst_vq(inst->fh.m2m_ctx);
+	if (vb2_is_streaming(vq))
+		v4l2_m2m_streamoff(file, inst->fh.m2m_ctx, vq->type);
+
+	vpu_inst_unlock(inst);
+}
+
 int vpu_v4l2_close(struct file *file)
 {
 	struct vpu_dev *vpu = video_drvdata(file);
@@ -774,6 +791,7 @@ int vpu_v4l2_close(struct file *file)
 
 	vpu_trace(vpu->dev, "tgid = %d, pid = %d, inst = %p\n", inst->tgid, inst->pid, inst);
 
+	vpu_v4l2_check_and_cancel(file, inst);
 	call_void_vop(inst, release);
 	vpu_inst_unregister(inst);
 	vpu_inst_put(inst);
-- 
2.38.1