All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jocelyn Falempe <jfalempe@redhat.com>
To: tzimmermann@suse.de, airlied@redhat.com, javierm@redhat.com,
	yizhan@redhat.com
Cc: Jocelyn Falempe <jfalempe@redhat.com>,
	stable@vger.kernel.org, dri-devel@lists.freedesktop.org
Subject: [PATCH 2/2] drm/client: Fix memory leak in drm_client_modeset_probe
Date: Tue, 11 Jul 2023 11:20:44 +0200	[thread overview]
Message-ID: <20230711092203.68157-3-jfalempe@redhat.com> (raw)
In-Reply-To: <20230711092203.68157-1-jfalempe@redhat.com>

When a new mode is set to modeset->mode, the previous mode should be freed.
This fixes the following kmemleak report:

drm_mode_duplicate+0x45/0x220 [drm]
drm_client_modeset_probe+0x944/0xf50 [drm]
__drm_fb_helper_initial_config_and_unlock+0xb4/0x2c0 [drm_kms_helper]
drm_fbdev_client_hotplug+0x2bc/0x4d0 [drm_kms_helper]
drm_client_register+0x169/0x240 [drm]
ast_pci_probe+0x142/0x190 [ast]
local_pci_probe+0xdc/0x180
work_for_cpu_fn+0x4e/0xa0
process_one_work+0x8b7/0x1540
worker_thread+0x70a/0xed0
kthread+0x29f/0x340
ret_from_fork+0x1f/0x30

cc: <stable@vger.kernel.org>
Reported-by: Zhang Yi <yizhan@redhat.com>
Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
---
 drivers/gpu/drm/drm_client_modeset.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/drm_client_modeset.c b/drivers/gpu/drm/drm_client_modeset.c
index a4a62aa99984..5d4703b4648a 100644
--- a/drivers/gpu/drm/drm_client_modeset.c
+++ b/drivers/gpu/drm/drm_client_modeset.c
@@ -867,6 +867,9 @@ int drm_client_modeset_probe(struct drm_client_dev *client, unsigned int width,
 				break;
 			}
 
+			if (modeset->mode)
+				kfree(modeset->mode);
+				
 			modeset->mode = drm_mode_duplicate(dev, mode);
 			drm_connector_get(connector);
 			modeset->connectors[modeset->num_connectors++] = connector;
-- 
2.41.0


WARNING: multiple messages have this Message-ID (diff)
From: Jocelyn Falempe <jfalempe@redhat.com>
To: tzimmermann@suse.de, airlied@redhat.com, javierm@redhat.com,
	yizhan@redhat.com
Cc: dri-devel@lists.freedesktop.org,
	Jocelyn Falempe <jfalempe@redhat.com>,
	stable@vger.kernel.org
Subject: [PATCH 2/2] drm/client: Fix memory leak in drm_client_modeset_probe
Date: Tue, 11 Jul 2023 11:20:44 +0200	[thread overview]
Message-ID: <20230711092203.68157-3-jfalempe@redhat.com> (raw)
In-Reply-To: <20230711092203.68157-1-jfalempe@redhat.com>

When a new mode is set to modeset->mode, the previous mode should be freed.
This fixes the following kmemleak report:

drm_mode_duplicate+0x45/0x220 [drm]
drm_client_modeset_probe+0x944/0xf50 [drm]
__drm_fb_helper_initial_config_and_unlock+0xb4/0x2c0 [drm_kms_helper]
drm_fbdev_client_hotplug+0x2bc/0x4d0 [drm_kms_helper]
drm_client_register+0x169/0x240 [drm]
ast_pci_probe+0x142/0x190 [ast]
local_pci_probe+0xdc/0x180
work_for_cpu_fn+0x4e/0xa0
process_one_work+0x8b7/0x1540
worker_thread+0x70a/0xed0
kthread+0x29f/0x340
ret_from_fork+0x1f/0x30

cc: <stable@vger.kernel.org>
Reported-by: Zhang Yi <yizhan@redhat.com>
Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
---
 drivers/gpu/drm/drm_client_modeset.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/drm_client_modeset.c b/drivers/gpu/drm/drm_client_modeset.c
index a4a62aa99984..5d4703b4648a 100644
--- a/drivers/gpu/drm/drm_client_modeset.c
+++ b/drivers/gpu/drm/drm_client_modeset.c
@@ -867,6 +867,9 @@ int drm_client_modeset_probe(struct drm_client_dev *client, unsigned int width,
 				break;
 			}
 
+			if (modeset->mode)
+				kfree(modeset->mode);
+				
 			modeset->mode = drm_mode_duplicate(dev, mode);
 			drm_connector_get(connector);
 			modeset->connectors[modeset->num_connectors++] = connector;
-- 
2.41.0


  parent reply	other threads:[~2023-07-11  9:22 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-11  9:20 [PATCH 0/2] Two memory leak fixes in drm_client_modeset.c Jocelyn Falempe
2023-07-11  9:20 ` [PATCH 1/2] drm/client: Fix memory leak in drm_client_target_cloned Jocelyn Falempe
2023-07-11  9:20   ` Jocelyn Falempe
2023-07-11  9:28   ` Javier Martinez Canillas
2023-07-11  9:28     ` Javier Martinez Canillas
2023-07-11  9:44   ` Thomas Zimmermann
2023-07-11  9:44     ` Thomas Zimmermann
2023-07-11  9:20 ` Jocelyn Falempe [this message]
2023-07-11  9:20   ` [PATCH 2/2] drm/client: Fix memory leak in drm_client_modeset_probe Jocelyn Falempe
2023-07-11  9:29   ` Javier Martinez Canillas
2023-07-11  9:29     ` Javier Martinez Canillas
2023-07-11  9:43   ` Thomas Zimmermann
2023-07-11  9:43     ` Thomas Zimmermann
2023-07-13 14:01 ` [PATCH 0/2] Two memory leak fixes in drm_client_modeset.c Jocelyn Falempe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230711092203.68157-3-jfalempe@redhat.com \
    --to=jfalempe@redhat.com \
    --cc=airlied@redhat.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=javierm@redhat.com \
    --cc=stable@vger.kernel.org \
    --cc=tzimmermann@suse.de \
    --cc=yizhan@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.