From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3606B3D1715 for ; Mon, 20 Jul 2026 08:58:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784537924; cv=none; b=XMv20/nIuZSCgjLOlMg4xmVl1KgQ3QZMXWOOrRPSDAiafYlpgQVdrp2begXzGYiX2S2JSl/QbWWFWNiEkrO0LLnfojfDnBHOhk7vGupOxCmp+DR6Lv2JAKnTAofmy0N/OcN70touL4dcfxKZ+iheosNPSjjd1lBqVCxmMak6JG4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784537924; c=relaxed/simple; bh=C8AEiXCDpVJ4T6CZGEvCJ5xIZmzvMLOejU2iVUFF5Q8=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cRN4Kgl5nmL85nVqMmXRHGgUJz1v3NXSfpUBah068EFpeTZW3H+Cxls3955Zx+EeNL0imoCPDisjI3PjAjBA53YrNogDhB7tNTXyF5f0F+EPnfBB2QNGRhUv/b0H6Bnqsr2O9NIxQtKTh2jKo5MryYhkj496StFsEZT7MYG4QvQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=pAnXrMwv; arc=none smtp.client-ip=209.85.210.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="pAnXrMwv" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-848882fdb18so7019230b3a.0 for ; Mon, 20 Jul 2026 01:58:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784537922; x=1785142722; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to:content-type; bh=RUKJxr+1tIy/FI363caVVmoJTRInNyqm1ZI8xlDvLAU=; b=pAnXrMwvYNZnVS/gYwMEkN4JN4U6GCMvdq++9saFFB7EEHlTHaS1lZJQJIJed4MAgp fNKH7SZpIWOIl8pm5i9KiOqVZRpqXwd1VO+OfNryGgW8El1SX2yZ0Lwkf9mRQVbYrEWf tAHYguZOTDlDyhPXWHGyibqmegZfq+GzN/Pr1mdWimij2byGwurkL3CtEebZWciShloW XohFTj3m9mc4xawdajamnr9tf92u2ggKGWdRxiCtXDvplu/M8pKLqGqTKjwcyThOh6/v z18Vmh2rr/7fiq3IQ+Anld+hatwNL1bVBKUMjmMVpdsuNUsGaOXNmltIo9V74/nDOekq Uf9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784537922; x=1785142722; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to:content-type; bh=RUKJxr+1tIy/FI363caVVmoJTRInNyqm1ZI8xlDvLAU=; b=Jm4b9KmLOQOwDgk4o/bUv3swFOTYilfYLf19Pyu/DvrwkET4he725ouHIEnB7cYM8U P7mFGGGAa40sMCLKTKbGUuvndSM4QSJEqmFetSpDBlE6XGTWyXHEIRvMyAICdmbKvM+Z 6fcNAKXvSYiO1SyhVpjTMaHaaY3dFvceXxU51/wL+Sa6/4iUAlb1rCxtmcFbKlu9SU8E xPBpUGP+vYQ4l8tEPhG5nFdToNV7QS73SimT4ELXbc1w+Gqplgbpdo5g8RYEWwyQ5Ckr la4JHd+6AK9oOnsOBbOG1bzXd2Zj48IwnYLZJQKQFO77TmBbVixW5mmQBdctM5efP2TG NQ8g== X-Forwarded-Encrypted: i=1; AHgh+RrJBE/iZioDuwWrleTDEkVEdnzzhq1arCMt4HYj2EKc2h4XVugwwziZMaDEiTBQym70Gm6N+B9ZQ88uHRs=@vger.kernel.org X-Gm-Message-State: AOJu0Yzh+kaKVSUk1wDv2FS0ZtygdOS6QWlV1meGHyzMNA/IczuLk2mG TUky1VbSsP1TOEsWNhJURhnTc9nxnMAVZIaJLddhoai069a5c+g1XfQH X-Gm-Gg: AfdE7cn/pDDmgTwnr30aUiGpW02iVLHS0Y7DX3OrtmyJF4js6S26Bfa5nIOajJoFTUj tTkIZwFP2Q8w9xyk8bOto3Pi5DzigHL62hX/jf9h5j3u8p2CMVX8k9pXAZfofvp43fhn64C3lG1 sPukJQy7aeZuZiQ46CRLAdy3L3XR4fHzVIfuzJKmmm+p0OQDWPDP1jyHIw+1kJ2WHu/5c2ZSHpe wNspJERwYF+wpR817f4avFMPSCDfjyAI4m5fFHp2rXrpkpYfRjBu4178bMghtJdkHSpyuDstznY NKVRLtLE1qjD46ZVVabvqPk8mZ9E+fJXLceoC42R3Hyy0v95CRtkiHgZgXsJWUhI7LMS6NAneil A2F7mLl4jxMxEHi3EnUoyU/AtkS9gcPWl+rW3H0hnqCDnZOb+HCxO6lyfkYnehjx//Ck= X-Received: by 2002:a05:6a00:14d1:b0:848:6c37:cd74 with SMTP id d2e1a72fcca58-84c29288282mr13097826b3a.22.1784537922386; Mon, 20 Jul 2026 01:58:42 -0700 (PDT) Received: from lgs.. ([118.193.39.55]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84c2adcc78asm5247901b3a.23.2026.07.20.01.58.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 01:58:41 -0700 (PDT) From: Guangshuo Li To: Minghsiu Tsai , Houlong Wei , Andrew-CT Chen , Mauro Carvalho Chehab , Matthias Brugger , AngeloGioacchino Del Regno , Tiffany Lin , Yunfei Dong , Hans Verkuil , Nicolas Dufresne , Chen-Yu Tsai , Fei Shao , Tomasz Figa , Guangshuo Li , Haoxiang Li , Eizan Miyamoto , Enric Balletbo i Serra , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH v2 3/3] media: mtk-mdp: unregister VPU watchdog handler Date: Mon, 20 Jul 2026 16:57:56 +0800 Message-ID: <20260720085756.465667-4-lgs201920130244@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260720085756.465667-1-lgs201920130244@gmail.com> References: <20260720085756.465667-1-lgs201920130244@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit mtk_mdp_probe() registers the MDP reset handler with the VPU watchdog code and passes the MDP device as the private data. The handler is stored in the VPU device and can outlive the MDP probe or remove path. If probe fails after the handler has been registered, or if the MDP device is removed, the watchdog table can retain a pointer to an MDP object that is about to be released. A later VPU watchdog reset can then call mtk_mdp_reset_handler() with a stale pointer and dereference freed memory while queuing the MDP watchdog work. Unregister the watchdog handler in the probe error path and in the remove path before dropping the VPU device reference. Fixes: ee18fc7b0b95 ("media: mtk-mdp: handle vpu_wdt_reg_handler() errors during probe") Reviewed-by: Nicolas Dufresne Signed-off-by: Guangshuo Li --- drivers/media/platform/mediatek/mdp/mtk_mdp_core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/media/platform/mediatek/mdp/mtk_mdp_core.c b/drivers/media/platform/mediatek/mdp/mtk_mdp_core.c index 8432833814f3..5ccb7aa925d9 100644 --- a/drivers/media/platform/mediatek/mdp/mtk_mdp_core.c +++ b/drivers/media/platform/mediatek/mdp/mtk_mdp_core.c @@ -221,6 +221,7 @@ static int mtk_mdp_probe(struct platform_device *pdev) return 0; err_reg_handler: + vpu_wdt_unreg_handler(mdp->vpu_dev, VPU_RST_MDP); platform_device_put(mdp->vpu_dev); err_vpu_get_dev: @@ -254,6 +255,7 @@ static void mtk_mdp_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); vb2_dma_contig_clear_max_seg_size(&pdev->dev); + vpu_wdt_unreg_handler(mdp->vpu_dev, VPU_RST_MDP); platform_device_put(mdp->vpu_dev); mtk_mdp_unregister_m2m_device(mdp); v4l2_device_unregister(&mdp->v4l2_dev); -- 2.43.0