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 964DD629EF; Tue, 23 Jan 2024 00:52:44 +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=1705971164; cv=none; b=jIIZZBu3VwqqMmUn84AftZ0nRfgOPYq25rLjVWMyzPaGT0r+oEmnE5F9MVpTd8myKMuWJrpBo3TQIBmvcJOGgk7liEWZvzj5QTs/Nld1Zr6RNZjKgbk0JNSH4euCN0HzCW0jsdw3AVh57dosSlsFuySmm+T6ABO+WKaRRREbQ+w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705971164; c=relaxed/simple; bh=UJHPOrj0oUPneESp9DC20+rKlb4zHTjfNUo8qIkkx2s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gdVzmbbvHu30thxE+d8ByAygOs3Xlvo8oSbdkwMXny4fj/e3gWz7xi5QQECvVXdFQ2kXii3Z8N+dmO3KJ1FrNJd8euTwcmDM2rsaA5FqYe3QEn7SLhZ9AfpaXwN3g9GoOlVrB1zZiaHtbPiE3JAqV7E2r8oXV/yLkW06iwqthdc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=txFEDu5c; 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="txFEDu5c" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 112C3C43390; Tue, 23 Jan 2024 00:52:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705971164; bh=UJHPOrj0oUPneESp9DC20+rKlb4zHTjfNUo8qIkkx2s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=txFEDu5ckhVzLiqV9vTenMsQY2BueltgaF14rJPyi4MOtw2gRJuJ/s4Ppr0IjL0oS z/jnPpcQIw7fKqTgFkOJ07dS4035lm0mtRDB0Bp9Ypu/Ki7yzTaFobih1ADilsn7u+ 5Qrcma6HeKdA0WkgAzeux0RQk9HqXEBoBItNxbz8= 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.1 167/417] 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:55:35 -0800 Message-ID: <20240122235757.625694797@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235751.480367507@linuxfoundation.org> References: <20240122235751.480367507@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.1-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 e9a4f8abd21c..3071b61946c3 100644 --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c @@ -1412,7 +1412,6 @@ static int 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