* [PATCH] drm/meson: fix memory leak on ->hpd_notify callback
@ 2023-09-14 13:10 Jani Nikula
2023-09-15 6:59 ` Neil Armstrong
2023-09-20 13:46 ` Neil Armstrong
0 siblings, 2 replies; 6+ messages in thread
From: Jani Nikula @ 2023-09-14 13:10 UTC (permalink / raw)
To: dri-devel
Cc: jani.nikula, Neil Armstrong, Sam Ravnborg, Martin Blumenstingl,
Neil Armstrong, Kevin Hilman, Jerome Brunet, linux-amlogic,
linux-arm-kernel, stable
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 <narmstrong@baylibre.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Cc: Neil Armstrong <neil.armstrong@linaro.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Jerome Brunet <jbrunet@baylibre.com>
Cc: dri-devel@lists.freedesktop.org
Cc: linux-amlogic@lists.infradead.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: <stable@vger.kernel.org> # v5.17+
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
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);
}
--
2.39.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] drm/meson: fix memory leak on ->hpd_notify callback
2023-09-14 13:10 [PATCH] drm/meson: fix memory leak on ->hpd_notify callback Jani Nikula
@ 2023-09-15 6:59 ` Neil Armstrong
2023-09-19 9:54 ` Jani Nikula
2023-09-20 13:46 ` Neil Armstrong
1 sibling, 1 reply; 6+ messages in thread
From: Neil Armstrong @ 2023-09-15 6:59 UTC (permalink / raw)
To: Jani Nikula, dri-devel
Cc: Neil Armstrong, Sam Ravnborg, Martin Blumenstingl, Kevin Hilman,
Jerome Brunet, linux-amlogic, linux-arm-kernel, stable
On 14/09/2023 15:10, Jani Nikula wrote:
> 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 <narmstrong@baylibre.com>
> Cc: Sam Ravnborg <sam@ravnborg.org>
> Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
> Cc: Neil Armstrong <neil.armstrong@linaro.org>
> Cc: Kevin Hilman <khilman@baylibre.com>
> Cc: Jerome Brunet <jbrunet@baylibre.com>
> Cc: dri-devel@lists.freedesktop.org
> Cc: linux-amlogic@lists.infradead.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: <stable@vger.kernel.org> # v5.17+
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> ---
>
> 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);
> }
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] drm/meson: fix memory leak on ->hpd_notify callback
2023-09-15 6:59 ` Neil Armstrong
@ 2023-09-19 9:54 ` Jani Nikula
2023-09-19 12:09 ` neil.armstrong
0 siblings, 1 reply; 6+ messages in thread
From: Jani Nikula @ 2023-09-19 9:54 UTC (permalink / raw)
To: neil.armstrong, dri-devel
Cc: Neil Armstrong, Sam Ravnborg, Martin Blumenstingl, Kevin Hilman,
Jerome Brunet, linux-amlogic, linux-arm-kernel, stable
On Fri, 15 Sep 2023, Neil Armstrong <neil.armstrong@linaro.org> wrote:
> On 14/09/2023 15:10, Jani Nikula wrote:
>> 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 <narmstrong@baylibre.com>
>> Cc: Sam Ravnborg <sam@ravnborg.org>
>> Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
>> Cc: Neil Armstrong <neil.armstrong@linaro.org>
>> Cc: Kevin Hilman <khilman@baylibre.com>
>> Cc: Jerome Brunet <jbrunet@baylibre.com>
>> Cc: dri-devel@lists.freedesktop.org
>> Cc: linux-amlogic@lists.infradead.org
>> Cc: linux-arm-kernel@lists.infradead.org
>> Cc: <stable@vger.kernel.org> # v5.17+
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>>
>> ---
>>
>> 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);
>> }
>
> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Thanks. I don't seem to have a toolchain to get this to build... would
you mind applying this, please?
BR,
Jani.
--
Jani Nikula, Intel
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] drm/meson: fix memory leak on ->hpd_notify callback
2023-09-19 9:54 ` Jani Nikula
@ 2023-09-19 12:09 ` neil.armstrong
0 siblings, 0 replies; 6+ messages in thread
From: neil.armstrong @ 2023-09-19 12:09 UTC (permalink / raw)
To: Jani Nikula, dri-devel
Cc: Neil Armstrong, Sam Ravnborg, Martin Blumenstingl, Kevin Hilman,
Jerome Brunet, linux-amlogic, linux-arm-kernel, stable
On 19/09/2023 11:54, Jani Nikula wrote:
> On Fri, 15 Sep 2023, Neil Armstrong <neil.armstrong@linaro.org> wrote:
>> On 14/09/2023 15:10, Jani Nikula wrote:
>>> 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 <narmstrong@baylibre.com>
>>> Cc: Sam Ravnborg <sam@ravnborg.org>
>>> Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
>>> Cc: Neil Armstrong <neil.armstrong@linaro.org>
>>> Cc: Kevin Hilman <khilman@baylibre.com>
>>> Cc: Jerome Brunet <jbrunet@baylibre.com>
>>> Cc: dri-devel@lists.freedesktop.org
>>> Cc: linux-amlogic@lists.infradead.org
>>> Cc: linux-arm-kernel@lists.infradead.org
>>> Cc: <stable@vger.kernel.org> # v5.17+
>>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>>>
>>> ---
>>>
>>> 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);
>>> }
>>
>> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
>
> Thanks. I don't seem to have a toolchain to get this to build... would
> you mind applying this, please?
Sure I'll handle this.
Thanks,
Neil
>
> BR,
> Jani.
>
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/meson: fix memory leak on ->hpd_notify callback
2023-09-14 13:10 [PATCH] drm/meson: fix memory leak on ->hpd_notify callback Jani Nikula
2023-09-15 6:59 ` Neil Armstrong
@ 2023-09-20 13:46 ` Neil Armstrong
2023-09-20 16:31 ` Jani Nikula
1 sibling, 1 reply; 6+ messages in thread
From: Neil Armstrong @ 2023-09-20 13:46 UTC (permalink / raw)
To: dri-devel, Jani Nikula
Cc: Sam Ravnborg, Martin Blumenstingl, Kevin Hilman, Jerome Brunet,
linux-amlogic, linux-arm-kernel, stable, Neil Armstrong
Hi,
On Thu, 14 Sep 2023 16:10:15 +0300, Jani Nikula wrote:
> The EDID returned by drm_bridge_get_edid() needs to be freed.
>
>
Thanks, Applied to https://anongit.freedesktop.org/git/drm/drm-misc.git (drm-misc-fixes)
[1/1] drm/meson: fix memory leak on ->hpd_notify callback
https://cgit.freedesktop.org/drm/drm-misc/commit/?id=099f0af9d98231bb74956ce92508e87cbcb896be
--
Neil
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] drm/meson: fix memory leak on ->hpd_notify callback
2023-09-20 13:46 ` Neil Armstrong
@ 2023-09-20 16:31 ` Jani Nikula
0 siblings, 0 replies; 6+ messages in thread
From: Jani Nikula @ 2023-09-20 16:31 UTC (permalink / raw)
To: Neil Armstrong, dri-devel
Cc: Sam Ravnborg, Martin Blumenstingl, Kevin Hilman, Jerome Brunet,
linux-amlogic, linux-arm-kernel, stable, Neil Armstrong
On Wed, 20 Sep 2023, Neil Armstrong <neil.armstrong@linaro.org> wrote:
> Hi,
>
> On Thu, 14 Sep 2023 16:10:15 +0300, Jani Nikula wrote:
>> The EDID returned by drm_bridge_get_edid() needs to be freed.
>>
>>
>
> Thanks, Applied to https://anongit.freedesktop.org/git/drm/drm-misc.git (drm-misc-fixes)
>
> [1/1] drm/meson: fix memory leak on ->hpd_notify callback
> https://cgit.freedesktop.org/drm/drm-misc/commit/?id=099f0af9d98231bb74956ce92508e87cbcb896be
Thanks,
Jani.
--
Jani Nikula, Intel
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-09-20 16:31 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-14 13:10 [PATCH] drm/meson: fix memory leak on ->hpd_notify callback Jani Nikula
2023-09-15 6:59 ` Neil Armstrong
2023-09-19 9:54 ` Jani Nikula
2023-09-19 12:09 ` neil.armstrong
2023-09-20 13:46 ` Neil Armstrong
2023-09-20 16:31 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).