* [PATCH] drm: xlnx: zynqmp_dpsub: Add NULL check in zynqmp_audio_init
@ 2025-02-08 10:03 Charles Han
2025-02-08 14:21 ` Laurent Pinchart
2025-02-08 16:00 ` [PATCH] drm: xlnx: zynqmp_dpsub: Add NULL checks in zynqmp_audio_init() Markus Elfring
0 siblings, 2 replies; 3+ messages in thread
From: Charles Han @ 2025-02-08 10:03 UTC (permalink / raw)
To: laurent.pinchart, tomi.valkeinen, maarten.lankhorst, mripard,
tzimmermann, airlied, simona, michal.simek, vishal.sagar
Cc: dri-devel, linux-arm-kernel, linux-kernel, Charles Han
devm_kasprintf() can return a NULL pointer on failure,but this
returned value in zynqmp_audio_init() is not checked.
Add NULL check in zynqmp_audio_init(), to handle kernel NULL
pointer dereference error.
Fixes: 3ec5c1579305 ("drm: xlnx: zynqmp_dpsub: Add DP audio support")
Signed-off-by: Charles Han <hanchunchao@inspur.com>
---
drivers/gpu/drm/xlnx/zynqmp_dp_audio.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/xlnx/zynqmp_dp_audio.c b/drivers/gpu/drm/xlnx/zynqmp_dp_audio.c
index fa5f0ace6084..f07ff4eb3a6d 100644
--- a/drivers/gpu/drm/xlnx/zynqmp_dp_audio.c
+++ b/drivers/gpu/drm/xlnx/zynqmp_dp_audio.c
@@ -323,12 +323,16 @@ int zynqmp_audio_init(struct zynqmp_dpsub *dpsub)
audio->dai_name = devm_kasprintf(dev, GFP_KERNEL,
"%s-dai", dev_name(dev));
+ if (!audio->dai_name)
+ return -ENOMEM;
for (unsigned int i = 0; i < ZYNQMP_NUM_PCMS; ++i) {
audio->link_names[i] = devm_kasprintf(dev, GFP_KERNEL,
"%s-dp-%u", dev_name(dev), i);
audio->pcm_names[i] = devm_kasprintf(dev, GFP_KERNEL,
"%s-pcm-%u", dev_name(dev), i);
+ if (!audio->link_names[i] || !audio->pcm_names[i])
+ return -ENOMEM;
}
audio->base = devm_platform_ioremap_resource_byname(pdev, "aud");
--
2.43.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm: xlnx: zynqmp_dpsub: Add NULL check in zynqmp_audio_init
2025-02-08 10:03 [PATCH] drm: xlnx: zynqmp_dpsub: Add NULL check in zynqmp_audio_init Charles Han
@ 2025-02-08 14:21 ` Laurent Pinchart
2025-02-08 16:00 ` [PATCH] drm: xlnx: zynqmp_dpsub: Add NULL checks in zynqmp_audio_init() Markus Elfring
1 sibling, 0 replies; 3+ messages in thread
From: Laurent Pinchart @ 2025-02-08 14:21 UTC (permalink / raw)
To: Charles Han
Cc: tomi.valkeinen, maarten.lankhorst, mripard, tzimmermann, airlied,
simona, michal.simek, vishal.sagar, dri-devel, linux-arm-kernel,
linux-kernel
Hi Charles,
Thank you for the patch.
On Sat, Feb 08, 2025 at 06:03:22PM +0800, Charles Han wrote:
> devm_kasprintf() can return a NULL pointer on failure,but this
s/but/ but/
> returned value in zynqmp_audio_init() is not checked.
> Add NULL check in zynqmp_audio_init(), to handle kernel NULL
> pointer dereference error.
>
> Fixes: 3ec5c1579305 ("drm: xlnx: zynqmp_dpsub: Add DP audio support")
> Signed-off-by: Charles Han <hanchunchao@inspur.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> drivers/gpu/drm/xlnx/zynqmp_dp_audio.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/xlnx/zynqmp_dp_audio.c b/drivers/gpu/drm/xlnx/zynqmp_dp_audio.c
> index fa5f0ace6084..f07ff4eb3a6d 100644
> --- a/drivers/gpu/drm/xlnx/zynqmp_dp_audio.c
> +++ b/drivers/gpu/drm/xlnx/zynqmp_dp_audio.c
> @@ -323,12 +323,16 @@ int zynqmp_audio_init(struct zynqmp_dpsub *dpsub)
>
> audio->dai_name = devm_kasprintf(dev, GFP_KERNEL,
> "%s-dai", dev_name(dev));
> + if (!audio->dai_name)
> + return -ENOMEM;
>
> for (unsigned int i = 0; i < ZYNQMP_NUM_PCMS; ++i) {
> audio->link_names[i] = devm_kasprintf(dev, GFP_KERNEL,
> "%s-dp-%u", dev_name(dev), i);
> audio->pcm_names[i] = devm_kasprintf(dev, GFP_KERNEL,
> "%s-pcm-%u", dev_name(dev), i);
> + if (!audio->link_names[i] || !audio->pcm_names[i])
> + return -ENOMEM;
> }
>
> audio->base = devm_platform_ioremap_resource_byname(pdev, "aud");
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm: xlnx: zynqmp_dpsub: Add NULL checks in zynqmp_audio_init()
2025-02-08 10:03 [PATCH] drm: xlnx: zynqmp_dpsub: Add NULL check in zynqmp_audio_init Charles Han
2025-02-08 14:21 ` Laurent Pinchart
@ 2025-02-08 16:00 ` Markus Elfring
1 sibling, 0 replies; 3+ messages in thread
From: Markus Elfring @ 2025-02-08 16:00 UTC (permalink / raw)
To: Charles Han, dri-devel, linux-arm-kernel, David Airlie,
Laurent Pinchart, Maarten Lankhorst, Maxime Ripard, Michal Simek,
Simona Vetter, Thomas Zimmermann, Tomi Valkeinen, Vishal Sagar
Cc: LKML
> devm_kasprintf() can return a NULL pointer on failure,but this
> returned value in zynqmp_audio_init() is not checked.
Another wording suggestion:
devm_kasprintf() calls can return null pointers on failure.
But some return values were not checked in zynqmp_audio_init().
> Add NULL check in zynqmp_audio_init(), to handle kernel NULL
> pointer dereference error.
Thus add three checks to prevent null pointer dereferences.
Regards,
Markus
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-02-08 16:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-02-08 10:03 [PATCH] drm: xlnx: zynqmp_dpsub: Add NULL check in zynqmp_audio_init Charles Han
2025-02-08 14:21 ` Laurent Pinchart
2025-02-08 16:00 ` [PATCH] drm: xlnx: zynqmp_dpsub: Add NULL checks in zynqmp_audio_init() Markus Elfring
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®