From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3FBC2651AC; Tue, 23 Jan 2024 01:58:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705975091; cv=none; b=AlZkQFiOnJWVgKsINK2euc8Jy5Bhz8nwJwKqYkmlWAxQIC8RukXu6Si9nO5Vap6iJM5N3MHEyWLOjBt527PKXSvGwM0C0Vha5T6vPJL5LCiwwuN2Bgx86NC+pifCCI/KfNf0ywyknGnGTzixMlNNZwfl3lPafEjF1wPInazDK/Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705975091; c=relaxed/simple; bh=YYUCxkBuEo0s1Cc73CCx1PRVLPlHyjEFX7t2jDhVGII=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=H+XS0x0D0Jrd3V1Zv6vo1pSmHJ2RUXln8cis5E9TEPwvrfYYmhEC5FU1fXmTsRXy0r8JKGcl+5D/cqmqtaYjxGpIaECM2hFKty6wjpTNGl9okR2E2W29/XSn/FEM0bp7l0xsDxWwXb8kbO6nT9UM75ofaSmLZRl0+P6U0jod+ZY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=VVvs2exf; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="VVvs2exf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 04F60C433C7; Tue, 23 Jan 2024 01:58:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705975091; bh=YYUCxkBuEo0s1Cc73CCx1PRVLPlHyjEFX7t2jDhVGII=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VVvs2exfMgbIeEI/Ymfaod65NTfdS8uaaHrT8kXqUcmNDFpBPviIDM6Bq0qcDI399 XWk1s9Heb6pvMCru+9FLFRuGb4xqugC2of23o7cBySKRseuaft23iAwuz6glpqL/Ge /MuQvGbpDuhCQ2owNRhlD1ix+0fJDCFwAWuqLdUo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zheng Wang , Dmitry Osipenko , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 6.6 234/583] media: mtk-jpeg: Remove cancel worker in mtk_jpeg_remove to avoid the crash of multi-core JPEG devices Date: Mon, 22 Jan 2024 15:54:45 -0800 Message-ID: <20240122235819.146432333@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235812.238724226@linuxfoundation.org> References: <20240122235812.238724226@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zheng Wang [ Upstream commit d8212c5c87c143ca01b78f6bf61244af07e0058e ] This patch reverts commit c677d7ae8314 ("media: mtk-jpeg: Fix use after free bug due to uncanceled work"). The job_timeout_work is initialized only for the single-core JPEG device so it will cause the crash for multi-core JPEG devices. Fix it by removing the cancel_delayed_work_sync function. Fixes: c677d7ae8314 ("media: mtk-jpeg: Fix use after free bug due to uncanceled work") Signed-off-by: Zheng Wang Signed-off-by: Dmitry Osipenko Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c index 7194f88edc0f..60425c99a2b8 100644 --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c @@ -1403,7 +1403,6 @@ static void mtk_jpeg_remove(struct platform_device *pdev) { struct mtk_jpeg_dev *jpeg = platform_get_drvdata(pdev); - cancel_delayed_work_sync(&jpeg->job_timeout_work); pm_runtime_disable(&pdev->dev); video_unregister_device(jpeg->vdev); v4l2_m2m_release(jpeg->m2m_dev); -- 2.43.0