From patchwork Thu Sep 14 13:10:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13385189 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 A1EA8CA553E for ; Thu, 14 Sep 2023 13:11:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B7B3510E56D; Thu, 14 Sep 2023 13:11:50 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6047F10E56D for ; Thu, 14 Sep 2023 13:11:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694697108; x=1726233108; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=9eVtr7Sm2yrP7NrW5lUGQE9mQKVpwxVDMhXgaOG0os0=; b=kjh/cKTmZxxn2Y1kBgRJBjZ4MkGxp+QRja86FZXy5akjCxLcA0uRj0YU iKdlrjgRPxtGwnQmEIEq4YG7nwkZBWgHdsDna95C8WcOT5i95mA0twCVP ONcgpcLW2NKGCXxuVsQK0s+cvc79dPNTV9Keu2NR7ctMAB4YZXeFBuRNt IrmbIhzuqp3LqtnRQO4QUi60iXcs3Xc+cAH4SoolYBXmyP6kRok5B8eP5 RodFe4RJsV7BchND1LYvTsdFoc0tN0GvTT8N8Y2zqvbunj4OLaPKV5JeW Uee2duGwbt8ltq2j//DlOSSxZpMg6xf9bQNhzaJhUritsAFzYxZOflidO w==; X-IronPort-AV: E=McAfee;i="6600,9927,10833"; a="358366685" X-IronPort-AV: E=Sophos;i="6.02,146,1688454000"; d="scan'208";a="358366685" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Sep 2023 06:10:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10833"; a="859696945" X-IronPort-AV: E=Sophos;i="6.02,146,1688454000"; d="scan'208";a="859696945" Received: from jnikula-mobl4.fi.intel.com (HELO localhost) ([10.237.66.162]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Sep 2023 06:10:23 -0700 From: Jani Nikula To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/meson: fix memory leak on ->hpd_notify callback Date: Thu, 14 Sep 2023 16:10:15 +0300 Message-Id: <20230914131015.2472029-1-jani.nikula@intel.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Neil Armstrong , Neil Armstrong , jani.nikula@intel.com, Kevin Hilman , stable@vger.kernel.org, Martin Blumenstingl , linux-amlogic@lists.infradead.org, Sam Ravnborg , linux-arm-kernel@lists.infradead.org, Jerome Brunet Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The EDID returned by drm_bridge_get_edid() needs to be freed. Fixes: 0af5e0b41110 ("drm/meson: encoder_hdmi: switch to bridge DRM_BRIDGE_ATTACH_NO_CONNECTOR") Cc: Neil Armstrong Cc: Sam Ravnborg Cc: Martin Blumenstingl Cc: Neil Armstrong Cc: Kevin Hilman Cc: Jerome Brunet Cc: dri-devel@lists.freedesktop.org Cc: linux-amlogic@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org Cc: # v5.17+ Signed-off-by: Jani Nikula Reviewed-by: Neil Armstrong --- UNTESTED --- drivers/gpu/drm/meson/meson_encoder_hdmi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/meson/meson_encoder_hdmi.c b/drivers/gpu/drm/meson/meson_encoder_hdmi.c index 9913971fa5d2..25ea76558690 100644 --- a/drivers/gpu/drm/meson/meson_encoder_hdmi.c +++ b/drivers/gpu/drm/meson/meson_encoder_hdmi.c @@ -334,6 +334,8 @@ static void meson_encoder_hdmi_hpd_notify(struct drm_bridge *bridge, return; cec_notifier_set_phys_addr_from_edid(encoder_hdmi->cec_notifier, edid); + + kfree(edid); } else cec_notifier_phys_addr_invalidate(encoder_hdmi->cec_notifier); }