UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/nouveau: fix edid memleak in nouveau_connector 

This was spotted by kmemleak.

Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Xavier Chantry 2010-01-11 22:42:21 +01:00 committed by Ben Skeggs
parent 3d9aefb8bd
commit c8ebe27579
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/gpu/drm/nouveau/nouveau_connector.c
View File

@ -83,14 +83,16 @@ nouveau_encoder_connector_get(struct nouveau_encoder *encoder)
static void static void
nouveau_connector_destroy(struct drm_connector *drm_connector) nouveau_connector_destroy(struct drm_connector *drm_connector)
{ {
struct nouveau_connector *connector = nouveau_connector(drm_connector); struct nouveau_connector *nv_connector =
struct drm_device *dev = connector->base.dev; nouveau_connector(drm_connector);
struct drm_device *dev = nv_connector->base.dev;
NV_DEBUG_KMS(dev, "\n"); NV_DEBUG_KMS(dev, "\n");
if (!connector) if (!nv_connector)
return; return;
kfree(nv_connector->edid);
drm_sysfs_connector_remove(drm_connector); drm_sysfs_connector_remove(drm_connector);
drm_connector_cleanup(drm_connector); drm_connector_cleanup(drm_connector);
kfree(drm_connector); kfree(drm_connector);
@ -237,6 +239,9 @@ nouveau_connector_detect(struct drm_connector *connector)
return connector_status_connected; return connector_status_connected;
} }
kfree(nv_connector->edid);
nv_connector->edid = NULL;
i2c = nouveau_connector_ddc_detect(connector, &nv_encoder); i2c = nouveau_connector_ddc_detect(connector, &nv_encoder);
if (i2c) { if (i2c) {
nouveau_connector_ddc_prepare(connector, &flags); nouveau_connector_ddc_prepare(connector, &flags);
@ -687,8 +692,12 @@ nouveau_connector_create_lvds(struct drm_device *dev,
*/ */
if (!nv_connector->edid && !nv_connector->native_mode && if (!nv_connector->edid && !nv_connector->native_mode &&
!dev_priv->VBIOS.pub.fp_no_ddc) { !dev_priv->VBIOS.pub.fp_no_ddc) {
nv_connector->edid = struct edid *edid =
(struct edid *)nouveau_bios_embedded_edid(dev); (struct edid *)nouveau_bios_embedded_edid(dev);
if (edid) {
nv_connector->edid = kmalloc(EDID_LENGTH, GFP_KERNEL);
*(nv_connector->edid) = *edid;
}
} }
if (!nv_connector->edid) if (!nv_connector->edid)