From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 74F5BC7EE23 for ; Mon, 1 May 2023 02:58:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=+QcBl6/qoLZ3oYeBlVOs6yKRBPt+tbIO57vip7w23E4=; b=P6fyar716kwD1z I/7zU8dSP5V+5rSYyQ3Hx0a/XKTAr3UBVCmk8vEvEKknuzxL1Oje48MKaaysPdgWRr8eDG5A1PxxU BEADllREkBcAu9PlTrf+gvb85IQlDOoAGJ6reVrWJUChxSjL7fc9uva4AMImPvZ2H186MlLIRnQV6 Bk/2PwSYD4VUg+PdnbGInhJXTX9f3j2ZAoSfgwaUtvDQDPpFDOQU7iOqQGsVJoo59xyK/VMfHt1D7 mMap5Rjfys/XoOH/nfG1zkz7D6Dd/pK+tlAf6TSqvdJ/32GvI0aT8c3sT4Ha0/2iUUUMIkRBMwh8j mLqzFBdOsEaX8XDWtHBw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1ptJjm-00F4I0-1B; Mon, 01 May 2023 02:58:02 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1ptJjj-00F4Gc-2b; Mon, 01 May 2023 02:58:01 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 42C0560EC9; Mon, 1 May 2023 02:57:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0AA0CC4339B; Mon, 1 May 2023 02:57:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682909879; bh=Vu0+qWqefyWhMzSESBgfYJzPeVchKVsuZgJb+f4X4Z8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LFj1930RxJJ+02gvE3QlyOc7gtlzKOK0uwWOElk816ihKdy81OzlM/ZAlDIdai5mZ ZsDOz+NFewAuExD4rBa8nqS7GaQB6njiYuwq1kRsTuTgytVoIWljJTU4P1YHTFoCRY TaWnSwmk38tRflVzWgIIbDUADielGyG4qWJKdmeWUOoHbT6BtUwns+WMO/AsgrS8aK R3aNqymW2XSUoPgI5DRGkNhqPPix55Qc1oqnqeI5I4hooWQ4la4eGrrUeM1GEtw8Bq eRrr/31oKgi53RCnwTIM2wKwpnjQWbSnCPclLQLhvruJEWpw5YhRkr8mpbN1lqcmMP 4pldsAyh8MEZg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Toby Chen , Heiko Stuebner , Sasha Levin , hjc@rock-chips.com, airlied@gmail.com, daniel@ffwll.ch, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Subject: [PATCH AUTOSEL 6.3 19/44] drm/rockchip: dw_hdmi: cleanup drm encoder during unbind Date: Sun, 30 Apr 2023 22:56:07 -0400 Message-Id: <20230501025632.3253067-19-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230501025632.3253067-1-sashal@kernel.org> References: <20230501025632.3253067-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230430_195759_883618_E02F0B9F X-CRM114-Status: GOOD ( 11.23 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Toby Chen [ Upstream commit b5af48eedcb53491c02ded55d5991e03d6da6dbf ] This fixes a use-after-free crash during rmmod. The DRM encoder is embedded inside the larger rockchip_hdmi, which is allocated with the component. The component memory gets freed before the main drm device is destroyed. Fix it by running encoder cleanup before tearing down its container. Signed-off-by: Toby Chen [moved encoder cleanup above clk_disable, similar to bind-error-path] Signed-off-by: Heiko Stuebner Link: https://patchwork.freedesktop.org/patch/msgid/20230317005126.496-1-tobyc@nvidia.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c index 2f4b8f64cbad3..ae857bf8bd624 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -640,6 +640,7 @@ static void dw_hdmi_rockchip_unbind(struct device *dev, struct device *master, struct rockchip_hdmi *hdmi = dev_get_drvdata(dev); dw_hdmi_unbind(hdmi->hdmi); + drm_encoder_cleanup(&hdmi->encoder.encoder); clk_disable_unprepare(hdmi->ref_clk); regulator_disable(hdmi->avdd_1v8); -- 2.39.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel