* [BUG] EDID leaks kernel memory @ 2012-08-11 16:51 Russell King - ARM Linux 2012-08-13 14:24 ` Daniel Vetter 0 siblings, 1 reply; 10+ messages in thread From: Russell King - ARM Linux @ 2012-08-11 16:51 UTC (permalink / raw) To: dri-devel Hi, While looking at the kernel DRM code, I've noticed that in many places we kmalloc() memory to store the raw EDID information, whether it be from a DDC adapter, or loaded from firmware. Nowhere can I find where this memory is freed. It seems in several places that we assign it into connector->display_info.raw_edid, and next time we obtain EDID information, we re-kmalloc and overwrite this pointer. Note that some drivers do kfree() this memory themselves after blindly setting connector->display_info.raw_edid to NULL... Can someone please point me to where this memory is freed? If not, I'll cook up a patch to add some kfree's. Thanks. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [BUG] EDID leaks kernel memory 2012-08-11 16:51 [BUG] EDID leaks kernel memory Russell King - ARM Linux @ 2012-08-13 14:24 ` Daniel Vetter 2012-08-15 9:32 ` [PATCH 0/4] remove raw_edid, and fix related memory leaks Jani Nikula 0 siblings, 1 reply; 10+ messages in thread From: Daniel Vetter @ 2012-08-13 14:24 UTC (permalink / raw) To: Russell King - ARM Linux; +Cc: Nikula, Jani, dri-devel On Sat, Aug 11, 2012 at 6:51 PM, Russell King - ARM Linux <linux@arm.linux.org.uk> wrote: > Hi, > > While looking at the kernel DRM code, I've noticed that in many places > we kmalloc() memory to store the raw EDID information, whether it be > from a DDC adapter, or loaded from firmware. > > Nowhere can I find where this memory is freed. It seems in several > places that we assign it into connector->display_info.raw_edid, and > next time we obtain EDID information, we re-kmalloc and overwrite this > pointer. > > Note that some drivers do kfree() this memory themselves after blindly > setting connector->display_info.raw_edid to NULL... > > Can someone please point me to where this memory is freed? If not, I'll > cook up a patch to add some kfree's. Afaik the right thing is to simply kill the raw_edid pointer and handle the edid kmalloc simple as some temp storage fully controlled by the drivers. I've volunteered Jani from our team to cook up a few patches to handle this. Yours, Daniel -- Daniel Vetter daniel.vetter@ffwll.ch - +41 (0) 79 364 57 48 - http://blog.ffwll.ch ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 0/4] remove raw_edid, and fix related memory leaks 2012-08-13 14:24 ` Daniel Vetter @ 2012-08-15 9:32 ` Jani Nikula 2012-08-15 9:32 ` [PATCH 1/4] drm/i915: fix EDID memory leak in SDVO Jani Nikula ` (3 more replies) 0 siblings, 4 replies; 10+ messages in thread From: Jani Nikula @ 2012-08-15 9:32 UTC (permalink / raw) To: dri-devel, linux, daniel, airlied; +Cc: jani.nikula Hi, this series addresses the EDID related memory leaks [1] by removing raw_edid altogether. Applies on drm-fixes. Please review. BR, Jani. [1] http://mid.gmane.org/20120811165118.GB18957@n2100.arm.linux.org.uk Jani Nikula (4): drm/i915: fix EDID memory leak in SDVO drm/ast: fix EDID memory leak drm/exynos: fix EDID memory leak in HDMI drm: remove the raw_edid field from struct drm_display_info drivers/gpu/drm/ast/ast_mode.c | 1 + drivers/gpu/drm/drm_edid.c | 3 --- drivers/gpu/drm/drm_edid_load.c | 23 +++++++++++++---------- drivers/gpu/drm/exynos/exynos_drm_connector.c | 4 +--- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 13 ------------- drivers/gpu/drm/exynos/exynos_hdmi.c | 1 + drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 2 -- drivers/gpu/drm/gma500/oaktrail_hdmi.c | 1 - drivers/gpu/drm/gma500/psb_intel_sdvo.c | 3 --- drivers/gpu/drm/i915/intel_dp.c | 4 ---- drivers/gpu/drm/i915/intel_hdmi.c | 3 --- drivers/gpu/drm/i915/intel_modes.c | 1 - drivers/gpu/drm/i915/intel_sdvo.c | 4 +--- drivers/gpu/drm/mgag200/mgag200_mode.c | 1 - drivers/gpu/drm/udl/udl_connector.c | 3 --- drivers/staging/omapdrm/omap_connector.c | 5 +---- include/drm/drm_crtc.h | 2 -- 17 files changed, 18 insertions(+), 56 deletions(-) -- 1.7.4.1 ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 1/4] drm/i915: fix EDID memory leak in SDVO 2012-08-15 9:32 ` [PATCH 0/4] remove raw_edid, and fix related memory leaks Jani Nikula @ 2012-08-15 9:32 ` Jani Nikula 2012-08-15 22:45 ` Daniel Vetter 2012-08-15 9:32 ` [PATCH 2/4] drm/ast: fix EDID memory leak Jani Nikula ` (2 subsequent siblings) 3 siblings, 1 reply; 10+ messages in thread From: Jani Nikula @ 2012-08-15 9:32 UTC (permalink / raw) To: dri-devel, linux, daniel, airlied; +Cc: jani.nikula The EDID returned by drm_get_edid() was never freed. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/intel_sdvo.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index d172e98..d81bb0b 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@ -1692,6 +1692,7 @@ static bool intel_sdvo_detect_hdmi_audio(struct drm_connector *connector) edid = intel_sdvo_get_edid(connector); if (edid != NULL && edid->input & DRM_EDID_INPUT_DIGITAL) has_audio = drm_detect_monitor_audio(edid); + kfree(edid); return has_audio; } -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 1/4] drm/i915: fix EDID memory leak in SDVO 2012-08-15 9:32 ` [PATCH 1/4] drm/i915: fix EDID memory leak in SDVO Jani Nikula @ 2012-08-15 22:45 ` Daniel Vetter 0 siblings, 0 replies; 10+ messages in thread From: Daniel Vetter @ 2012-08-15 22:45 UTC (permalink / raw) To: Jani Nikula; +Cc: linux, dri-devel On Wed, Aug 15, 2012 at 12:32:36PM +0300, Jani Nikula wrote: > The EDID returned by drm_get_edid() was never freed. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> Picked up for -fixes, thanks for the patch. -Daniel -- Daniel Vetter Mail: daniel@ffwll.ch Mobile: +41 (0)79 365 57 48 ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 2/4] drm/ast: fix EDID memory leak 2012-08-15 9:32 ` [PATCH 0/4] remove raw_edid, and fix related memory leaks Jani Nikula 2012-08-15 9:32 ` [PATCH 1/4] drm/i915: fix EDID memory leak in SDVO Jani Nikula @ 2012-08-15 9:32 ` Jani Nikula 2012-08-15 9:32 ` [PATCH 3/4] drm/exynos: fix EDID memory leak in HDMI Jani Nikula 2012-08-15 9:32 ` [PATCH 4/4] drm: remove the raw_edid field from struct drm_display_info Jani Nikula 3 siblings, 0 replies; 10+ messages in thread From: Jani Nikula @ 2012-08-15 9:32 UTC (permalink / raw) To: dri-devel, linux, daniel, airlied; +Cc: jani.nikula The EDID returned by drm_get_edid() was never freed. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/ast/ast_mode.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c index 7282c08..866e9d4 100644 --- a/drivers/gpu/drm/ast/ast_mode.c +++ b/drivers/gpu/drm/ast/ast_mode.c @@ -737,6 +737,7 @@ static int ast_get_modes(struct drm_connector *connector) if (edid) { drm_mode_connector_update_edid_property(&ast_connector->base, edid); ret = drm_add_edid_modes(connector, edid); + kfree(edid); return ret; } else drm_mode_connector_update_edid_property(&ast_connector->base, NULL); -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/4] drm/exynos: fix EDID memory leak in HDMI 2012-08-15 9:32 ` [PATCH 0/4] remove raw_edid, and fix related memory leaks Jani Nikula 2012-08-15 9:32 ` [PATCH 1/4] drm/i915: fix EDID memory leak in SDVO Jani Nikula 2012-08-15 9:32 ` [PATCH 2/4] drm/ast: fix EDID memory leak Jani Nikula @ 2012-08-15 9:32 ` Jani Nikula 2012-08-22 4:21 ` InKi Dae 2012-08-15 9:32 ` [PATCH 4/4] drm: remove the raw_edid field from struct drm_display_info Jani Nikula 3 siblings, 1 reply; 10+ messages in thread From: Jani Nikula @ 2012-08-15 9:32 UTC (permalink / raw) To: dri-devel, linux, daniel, airlied; +Cc: jani.nikula The EDID returned by drm_get_edid() was never freed. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/exynos/exynos_hdmi.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index 409e2ec..b55335b 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -1282,6 +1282,7 @@ static int hdmi_get_edid(void *ctx, struct drm_connector *connector, DRM_DEBUG_KMS("%s : width[%d] x height[%d]\n", (hdata->dvi_mode ? "dvi monitor" : "hdmi monitor"), raw_edid->width_cm, raw_edid->height_cm); + kfree(raw_edid); } else { return -ENODEV; } -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 3/4] drm/exynos: fix EDID memory leak in HDMI 2012-08-15 9:32 ` [PATCH 3/4] drm/exynos: fix EDID memory leak in HDMI Jani Nikula @ 2012-08-22 4:21 ` InKi Dae 0 siblings, 0 replies; 10+ messages in thread From: InKi Dae @ 2012-08-22 4:21 UTC (permalink / raw) To: Jani Nikula; +Cc: linux, dri-devel 2012/8/15 Jani Nikula <jani.nikula@intel.com>: > The EDID returned by drm_get_edid() was never freed. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/exynos/exynos_hdmi.c | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c > index 409e2ec..b55335b 100644 > --- a/drivers/gpu/drm/exynos/exynos_hdmi.c > +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c > @@ -1282,6 +1282,7 @@ static int hdmi_get_edid(void *ctx, struct drm_connector *connector, > DRM_DEBUG_KMS("%s : width[%d] x height[%d]\n", > (hdata->dvi_mode ? "dvi monitor" : "hdmi monitor"), > raw_edid->width_cm, raw_edid->height_cm); > + kfree(raw_edid); Applied, Thanks. > } else { > return -ENODEV; > } > -- > 1.7.4.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 4/4] drm: remove the raw_edid field from struct drm_display_info 2012-08-15 9:32 ` [PATCH 0/4] remove raw_edid, and fix related memory leaks Jani Nikula ` (2 preceding siblings ...) 2012-08-15 9:32 ` [PATCH 3/4] drm/exynos: fix EDID memory leak in HDMI Jani Nikula @ 2012-08-15 9:32 ` Jani Nikula 2012-08-22 5:18 ` InKi Dae 3 siblings, 1 reply; 10+ messages in thread From: Jani Nikula @ 2012-08-15 9:32 UTC (permalink / raw) To: dri-devel, linux, daniel, airlied; +Cc: jani.nikula Neither the drm core nor any of the drivers really need the raw_edid field of struct drm_display_info for anything. Instead of being useful, it creates confusion about who is responsible for freeing the memory it points to and setting the field to NULL afterwards, leading to memory leaks and dangling pointers. Remove the raw_edid field, and fix drivers as necessary. Reported-by: Russell King <linux@arm.linux.org.uk> Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/drm_edid.c | 3 --- drivers/gpu/drm/drm_edid_load.c | 23 +++++++++++++---------- drivers/gpu/drm/exynos/exynos_drm_connector.c | 4 +--- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 13 ------------- drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 2 -- drivers/gpu/drm/gma500/oaktrail_hdmi.c | 1 - drivers/gpu/drm/gma500/psb_intel_sdvo.c | 3 --- drivers/gpu/drm/i915/intel_dp.c | 4 ---- drivers/gpu/drm/i915/intel_hdmi.c | 3 --- drivers/gpu/drm/i915/intel_modes.c | 1 - drivers/gpu/drm/i915/intel_sdvo.c | 3 --- drivers/gpu/drm/mgag200/mgag200_mode.c | 1 - drivers/gpu/drm/udl/udl_connector.c | 3 --- drivers/staging/omapdrm/omap_connector.c | 5 +---- include/drm/drm_crtc.h | 2 -- 15 files changed, 15 insertions(+), 56 deletions(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index a8743c3..bcc4725 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -399,10 +399,7 @@ struct edid *drm_get_edid(struct drm_connector *connector, if (drm_probe_ddc(adapter)) edid = (struct edid *)drm_do_get_edid(connector, adapter); - connector->display_info.raw_edid = (char *)edid; - return edid; - } EXPORT_SYMBOL(drm_get_edid); diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c index 0303935..186832e 100644 --- a/drivers/gpu/drm/drm_edid_load.c +++ b/drivers/gpu/drm/drm_edid_load.c @@ -114,8 +114,8 @@ static u8 generic_edid[GENERIC_EDIDS][128] = { }, }; -static int edid_load(struct drm_connector *connector, char *name, - char *connector_name) +static u8 *edid_load(struct drm_connector *connector, char *name, + char *connector_name) { const struct firmware *fw; struct platform_device *pdev; @@ -205,7 +205,6 @@ static int edid_load(struct drm_connector *connector, char *name, edid = new_edid; } - connector->display_info.raw_edid = edid; DRM_INFO("Got %s EDID base block and %d extension%s from " "\"%s\" for connector \"%s\"\n", builtin ? "built-in" : "external", valid_extensions, valid_extensions == 1 ? "" : "s", @@ -215,7 +214,10 @@ relfw_out: release_firmware(fw); out: - return err; + if (err) + return ERR_PTR(err); + + return edid; } int drm_load_edid_firmware(struct drm_connector *connector) @@ -223,6 +225,7 @@ int drm_load_edid_firmware(struct drm_connector *connector) char *connector_name = drm_get_connector_name(connector); char *edidname = edid_firmware, *last, *colon; int ret; + struct edid *edid; if (*edidname == '\0') return 0; @@ -240,13 +243,13 @@ int drm_load_edid_firmware(struct drm_connector *connector) if (*last == '\n') *last = '\0'; - ret = edid_load(connector, edidname, connector_name); - if (ret) + edid = (struct edid *) edid_load(connector, edidname, connector_name); + if (IS_ERR_OR_NULL(edid)) return 0; - drm_mode_connector_update_edid_property(connector, - (struct edid *) connector->display_info.raw_edid); + drm_mode_connector_update_edid_property(connector, edid); + ret = drm_add_edid_modes(connector, edid); + kfree(edid); - return drm_add_edid_modes(connector, (struct edid *) - connector->display_info.raw_edid); + return ret; } diff --git a/drivers/gpu/drm/exynos/exynos_drm_connector.c b/drivers/gpu/drm/exynos/exynos_drm_connector.c index d956819..9dce3b9 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_connector.c +++ b/drivers/gpu/drm/exynos/exynos_drm_connector.c @@ -147,9 +147,7 @@ static int exynos_drm_connector_get_modes(struct drm_connector *connector) drm_mode_connector_update_edid_property(connector, edid); count = drm_add_edid_modes(connector, edid); - - kfree(connector->display_info.raw_edid); - connector->display_info.raw_edid = edid; + kfree(edid); } else { struct drm_display_mode *mode = drm_mode_create(connector->dev); struct exynos_drm_panel_info *panel; diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c index bb1550c..9239525 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c @@ -102,7 +102,6 @@ static int vidi_get_edid(struct device *dev, struct drm_connector *connector, u8 *edid, int len) { struct vidi_context *ctx = get_vidi_context(dev); - struct edid *raw_edid; DRM_DEBUG_KMS("%s\n", __FILE__); @@ -115,18 +114,6 @@ static int vidi_get_edid(struct device *dev, struct drm_connector *connector, return -EFAULT; } - raw_edid = kzalloc(len, GFP_KERNEL); - if (!raw_edid) { - DRM_DEBUG_KMS("failed to allocate raw_edid.\n"); - return -ENOMEM; - } - - memcpy(raw_edid, ctx->raw_edid, min((1 + ctx->raw_edid->extensions) - * EDID_LENGTH, len)); - - /* attach the edid data to connector. */ - connector->display_info.raw_edid = (char *)raw_edid; - memcpy(edid, ctx->raw_edid, min((1 + ctx->raw_edid->extensions) * EDID_LENGTH, len)); diff --git a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c index a86f87b..9db0ef1 100644 --- a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c +++ b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c @@ -157,8 +157,6 @@ static enum drm_connector_status cdv_hdmi_detect( hdmi_priv->has_hdmi_audio = drm_detect_monitor_audio(edid); } - - psb_intel_connector->base.display_info.raw_edid = NULL; kfree(edid); } return status; diff --git a/drivers/gpu/drm/gma500/oaktrail_hdmi.c b/drivers/gpu/drm/gma500/oaktrail_hdmi.c index 2eb3dc4..69e51e9 100644 --- a/drivers/gpu/drm/gma500/oaktrail_hdmi.c +++ b/drivers/gpu/drm/gma500/oaktrail_hdmi.c @@ -252,7 +252,6 @@ static int oaktrail_hdmi_get_modes(struct drm_connector *connector) if (edid) { drm_mode_connector_update_edid_property(connector, edid); ret = drm_add_edid_modes(connector, edid); - connector->display_info.raw_edid = NULL; } /* diff --git a/drivers/gpu/drm/gma500/psb_intel_sdvo.c b/drivers/gpu/drm/gma500/psb_intel_sdvo.c index 0466c7b..a453d94 100644 --- a/drivers/gpu/drm/gma500/psb_intel_sdvo.c +++ b/drivers/gpu/drm/gma500/psb_intel_sdvo.c @@ -1343,7 +1343,6 @@ psb_intel_sdvo_hdmi_sink_detect(struct drm_connector *connector) } } else status = connector_status_disconnected; - connector->display_info.raw_edid = NULL; kfree(edid); } @@ -1404,7 +1403,6 @@ psb_intel_sdvo_detect(struct drm_connector *connector, bool force) ret = connector_status_disconnected; else ret = connector_status_connected; - connector->display_info.raw_edid = NULL; kfree(edid); } else ret = connector_status_connected; @@ -1453,7 +1451,6 @@ static void psb_intel_sdvo_get_ddc_modes(struct drm_connector *connector) drm_add_edid_modes(connector, edid); } - connector->display_info.raw_edid = NULL; kfree(edid); } } diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 0a56b9a..bffd8cc 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -2160,7 +2160,6 @@ intel_dp_get_edid_modes(struct drm_connector *connector, struct i2c_adapter *ada ret = drm_add_edid_modes(connector, intel_dp->edid); drm_edid_to_eld(connector, intel_dp->edid); - connector->display_info.raw_edid = NULL; return intel_dp->edid_mode_count; } @@ -2206,7 +2205,6 @@ intel_dp_detect(struct drm_connector *connector, bool force) edid = intel_dp_get_edid(connector, &intel_dp->adapter); if (edid) { intel_dp->has_audio = drm_detect_monitor_audio(edid); - connector->display_info.raw_edid = NULL; kfree(edid); } } @@ -2271,8 +2269,6 @@ intel_dp_detect_audio(struct drm_connector *connector) edid = intel_dp_get_edid(connector, &intel_dp->adapter); if (edid) { has_audio = drm_detect_monitor_audio(edid); - - connector->display_info.raw_edid = NULL; kfree(edid); } diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 98f6024..6a29f72 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -737,7 +737,6 @@ intel_hdmi_detect(struct drm_connector *connector, bool force) drm_detect_hdmi_monitor(edid); intel_hdmi->has_audio = drm_detect_monitor_audio(edid); } - connector->display_info.raw_edid = NULL; kfree(edid); } @@ -778,8 +777,6 @@ intel_hdmi_detect_audio(struct drm_connector *connector) if (edid) { if (edid->input & DRM_EDID_INPUT_DIGITAL) has_audio = drm_detect_monitor_audio(edid); - - connector->display_info.raw_edid = NULL; kfree(edid); } diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c index 45848b9..7a5238f 100644 --- a/drivers/gpu/drm/i915/intel_modes.c +++ b/drivers/gpu/drm/i915/intel_modes.c @@ -50,7 +50,6 @@ int intel_ddc_get_modes(struct drm_connector *connector, drm_mode_connector_update_edid_property(connector, edid); ret = drm_add_edid_modes(connector, edid); drm_edid_to_eld(connector, edid); - connector->display_info.raw_edid = NULL; kfree(edid); } diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index d81bb0b..7dad271 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@ -1345,7 +1345,6 @@ intel_sdvo_tmds_sink_detect(struct drm_connector *connector) } } else status = connector_status_disconnected; - connector->display_info.raw_edid = NULL; kfree(edid); } @@ -1419,7 +1418,6 @@ intel_sdvo_detect(struct drm_connector *connector, bool force) else ret = connector_status_disconnected; - connector->display_info.raw_edid = NULL; kfree(edid); } else ret = connector_status_connected; @@ -1465,7 +1463,6 @@ static void intel_sdvo_get_ddc_modes(struct drm_connector *connector) drm_add_edid_modes(connector, edid); } - connector->display_info.raw_edid = NULL; kfree(edid); } } diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c index b69642d..c7420e8 100644 --- a/drivers/gpu/drm/mgag200/mgag200_mode.c +++ b/drivers/gpu/drm/mgag200/mgag200_mode.c @@ -1399,7 +1399,6 @@ static int mga_vga_get_modes(struct drm_connector *connector) if (edid) { drm_mode_connector_update_edid_property(connector, edid); ret = drm_add_edid_modes(connector, edid); - connector->display_info.raw_edid = NULL; kfree(edid); } return ret; diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c index ba055e9..2d98ff9 100644 --- a/drivers/gpu/drm/udl/udl_connector.c +++ b/drivers/gpu/drm/udl/udl_connector.c @@ -57,11 +57,8 @@ static int udl_get_modes(struct drm_connector *connector) edid = (struct edid *)udl_get_edid(udl); - connector->display_info.raw_edid = (char *)edid; - drm_mode_connector_update_edid_property(connector, edid); ret = drm_add_edid_modes(connector, edid); - connector->display_info.raw_edid = NULL; kfree(edid); return ret; } diff --git a/drivers/staging/omapdrm/omap_connector.c b/drivers/staging/omapdrm/omap_connector.c index 5e2856c..9c2287b 100644 --- a/drivers/staging/omapdrm/omap_connector.c +++ b/drivers/staging/omapdrm/omap_connector.c @@ -177,14 +177,11 @@ static int omap_connector_get_modes(struct drm_connector *connector) drm_mode_connector_update_edid_property( connector, edid); n = drm_add_edid_modes(connector, edid); - kfree(connector->display_info.raw_edid); - connector->display_info.raw_edid = edid; } else { drm_mode_connector_update_edid_property( connector, NULL); - connector->display_info.raw_edid = NULL; - kfree(edid); } + kfree(edid); } else { struct drm_display_mode *mode = drm_mode_create(dev); struct omap_video_timings timings; diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index a1a0386..0522044 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -216,8 +216,6 @@ struct drm_display_info { u32 color_formats; u8 cea_rev; - - char *raw_edid; /* if any */ }; struct drm_framebuffer_funcs { -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 4/4] drm: remove the raw_edid field from struct drm_display_info 2012-08-15 9:32 ` [PATCH 4/4] drm: remove the raw_edid field from struct drm_display_info Jani Nikula @ 2012-08-22 5:18 ` InKi Dae 0 siblings, 0 replies; 10+ messages in thread From: InKi Dae @ 2012-08-22 5:18 UTC (permalink / raw) To: Jani Nikula; +Cc: linux, dri-devel Acked-by: Inki Dae <inki.dae@samsung.com> 2012/8/15 Jani Nikula <jani.nikula@intel.com>: > Neither the drm core nor any of the drivers really need the raw_edid field > of struct drm_display_info for anything. Instead of being useful, it > creates confusion about who is responsible for freeing the memory it points > to and setting the field to NULL afterwards, leading to memory leaks and > dangling pointers. > > Remove the raw_edid field, and fix drivers as necessary. > > Reported-by: Russell King <linux@arm.linux.org.uk> > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/drm_edid.c | 3 --- > drivers/gpu/drm/drm_edid_load.c | 23 +++++++++++++---------- > drivers/gpu/drm/exynos/exynos_drm_connector.c | 4 +--- > drivers/gpu/drm/exynos/exynos_drm_vidi.c | 13 ------------- > drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 2 -- > drivers/gpu/drm/gma500/oaktrail_hdmi.c | 1 - > drivers/gpu/drm/gma500/psb_intel_sdvo.c | 3 --- > drivers/gpu/drm/i915/intel_dp.c | 4 ---- > drivers/gpu/drm/i915/intel_hdmi.c | 3 --- > drivers/gpu/drm/i915/intel_modes.c | 1 - > drivers/gpu/drm/i915/intel_sdvo.c | 3 --- > drivers/gpu/drm/mgag200/mgag200_mode.c | 1 - > drivers/gpu/drm/udl/udl_connector.c | 3 --- > drivers/staging/omapdrm/omap_connector.c | 5 +---- > include/drm/drm_crtc.h | 2 -- > 15 files changed, 15 insertions(+), 56 deletions(-) > > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c > index a8743c3..bcc4725 100644 > --- a/drivers/gpu/drm/drm_edid.c > +++ b/drivers/gpu/drm/drm_edid.c > @@ -399,10 +399,7 @@ struct edid *drm_get_edid(struct drm_connector *connector, > if (drm_probe_ddc(adapter)) > edid = (struct edid *)drm_do_get_edid(connector, adapter); > > - connector->display_info.raw_edid = (char *)edid; > - > return edid; > - > } > EXPORT_SYMBOL(drm_get_edid); > > diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c > index 0303935..186832e 100644 > --- a/drivers/gpu/drm/drm_edid_load.c > +++ b/drivers/gpu/drm/drm_edid_load.c > @@ -114,8 +114,8 @@ static u8 generic_edid[GENERIC_EDIDS][128] = { > }, > }; > > -static int edid_load(struct drm_connector *connector, char *name, > - char *connector_name) > +static u8 *edid_load(struct drm_connector *connector, char *name, > + char *connector_name) > { > const struct firmware *fw; > struct platform_device *pdev; > @@ -205,7 +205,6 @@ static int edid_load(struct drm_connector *connector, char *name, > edid = new_edid; > } > > - connector->display_info.raw_edid = edid; > DRM_INFO("Got %s EDID base block and %d extension%s from " > "\"%s\" for connector \"%s\"\n", builtin ? "built-in" : > "external", valid_extensions, valid_extensions == 1 ? "" : "s", > @@ -215,7 +214,10 @@ relfw_out: > release_firmware(fw); > > out: > - return err; > + if (err) > + return ERR_PTR(err); > + > + return edid; > } > > int drm_load_edid_firmware(struct drm_connector *connector) > @@ -223,6 +225,7 @@ int drm_load_edid_firmware(struct drm_connector *connector) > char *connector_name = drm_get_connector_name(connector); > char *edidname = edid_firmware, *last, *colon; > int ret; > + struct edid *edid; > > if (*edidname == '\0') > return 0; > @@ -240,13 +243,13 @@ int drm_load_edid_firmware(struct drm_connector *connector) > if (*last == '\n') > *last = '\0'; > > - ret = edid_load(connector, edidname, connector_name); > - if (ret) > + edid = (struct edid *) edid_load(connector, edidname, connector_name); > + if (IS_ERR_OR_NULL(edid)) > return 0; > > - drm_mode_connector_update_edid_property(connector, > - (struct edid *) connector->display_info.raw_edid); > + drm_mode_connector_update_edid_property(connector, edid); > + ret = drm_add_edid_modes(connector, edid); > + kfree(edid); > > - return drm_add_edid_modes(connector, (struct edid *) > - connector->display_info.raw_edid); > + return ret; > } > diff --git a/drivers/gpu/drm/exynos/exynos_drm_connector.c b/drivers/gpu/drm/exynos/exynos_drm_connector.c > index d956819..9dce3b9 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_connector.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_connector.c > @@ -147,9 +147,7 @@ static int exynos_drm_connector_get_modes(struct drm_connector *connector) > > drm_mode_connector_update_edid_property(connector, edid); > count = drm_add_edid_modes(connector, edid); > - > - kfree(connector->display_info.raw_edid); > - connector->display_info.raw_edid = edid; > + kfree(edid); > } else { > struct drm_display_mode *mode = drm_mode_create(connector->dev); > struct exynos_drm_panel_info *panel; > diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c > index bb1550c..9239525 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c > @@ -102,7 +102,6 @@ static int vidi_get_edid(struct device *dev, struct drm_connector *connector, > u8 *edid, int len) > { > struct vidi_context *ctx = get_vidi_context(dev); > - struct edid *raw_edid; > > DRM_DEBUG_KMS("%s\n", __FILE__); > > @@ -115,18 +114,6 @@ static int vidi_get_edid(struct device *dev, struct drm_connector *connector, > return -EFAULT; > } > > - raw_edid = kzalloc(len, GFP_KERNEL); > - if (!raw_edid) { > - DRM_DEBUG_KMS("failed to allocate raw_edid.\n"); > - return -ENOMEM; > - } > - > - memcpy(raw_edid, ctx->raw_edid, min((1 + ctx->raw_edid->extensions) > - * EDID_LENGTH, len)); > - > - /* attach the edid data to connector. */ > - connector->display_info.raw_edid = (char *)raw_edid; > - > memcpy(edid, ctx->raw_edid, min((1 + ctx->raw_edid->extensions) > * EDID_LENGTH, len)); > > diff --git a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c > index a86f87b..9db0ef1 100644 > --- a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c > +++ b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c > @@ -157,8 +157,6 @@ static enum drm_connector_status cdv_hdmi_detect( > hdmi_priv->has_hdmi_audio = > drm_detect_monitor_audio(edid); > } > - > - psb_intel_connector->base.display_info.raw_edid = NULL; > kfree(edid); > } > return status; > diff --git a/drivers/gpu/drm/gma500/oaktrail_hdmi.c b/drivers/gpu/drm/gma500/oaktrail_hdmi.c > index 2eb3dc4..69e51e9 100644 > --- a/drivers/gpu/drm/gma500/oaktrail_hdmi.c > +++ b/drivers/gpu/drm/gma500/oaktrail_hdmi.c > @@ -252,7 +252,6 @@ static int oaktrail_hdmi_get_modes(struct drm_connector *connector) > if (edid) { > drm_mode_connector_update_edid_property(connector, edid); > ret = drm_add_edid_modes(connector, edid); > - connector->display_info.raw_edid = NULL; > } > > /* > diff --git a/drivers/gpu/drm/gma500/psb_intel_sdvo.c b/drivers/gpu/drm/gma500/psb_intel_sdvo.c > index 0466c7b..a453d94 100644 > --- a/drivers/gpu/drm/gma500/psb_intel_sdvo.c > +++ b/drivers/gpu/drm/gma500/psb_intel_sdvo.c > @@ -1343,7 +1343,6 @@ psb_intel_sdvo_hdmi_sink_detect(struct drm_connector *connector) > } > } else > status = connector_status_disconnected; > - connector->display_info.raw_edid = NULL; > kfree(edid); > } > > @@ -1404,7 +1403,6 @@ psb_intel_sdvo_detect(struct drm_connector *connector, bool force) > ret = connector_status_disconnected; > else > ret = connector_status_connected; > - connector->display_info.raw_edid = NULL; > kfree(edid); > } else > ret = connector_status_connected; > @@ -1453,7 +1451,6 @@ static void psb_intel_sdvo_get_ddc_modes(struct drm_connector *connector) > drm_add_edid_modes(connector, edid); > } > > - connector->display_info.raw_edid = NULL; > kfree(edid); > } > } > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index 0a56b9a..bffd8cc 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -2160,7 +2160,6 @@ intel_dp_get_edid_modes(struct drm_connector *connector, struct i2c_adapter *ada > ret = drm_add_edid_modes(connector, intel_dp->edid); > drm_edid_to_eld(connector, > intel_dp->edid); > - connector->display_info.raw_edid = NULL; > return intel_dp->edid_mode_count; > } > > @@ -2206,7 +2205,6 @@ intel_dp_detect(struct drm_connector *connector, bool force) > edid = intel_dp_get_edid(connector, &intel_dp->adapter); > if (edid) { > intel_dp->has_audio = drm_detect_monitor_audio(edid); > - connector->display_info.raw_edid = NULL; > kfree(edid); > } > } > @@ -2271,8 +2269,6 @@ intel_dp_detect_audio(struct drm_connector *connector) > edid = intel_dp_get_edid(connector, &intel_dp->adapter); > if (edid) { > has_audio = drm_detect_monitor_audio(edid); > - > - connector->display_info.raw_edid = NULL; > kfree(edid); > } > > diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c > index 98f6024..6a29f72 100644 > --- a/drivers/gpu/drm/i915/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/intel_hdmi.c > @@ -737,7 +737,6 @@ intel_hdmi_detect(struct drm_connector *connector, bool force) > drm_detect_hdmi_monitor(edid); > intel_hdmi->has_audio = drm_detect_monitor_audio(edid); > } > - connector->display_info.raw_edid = NULL; > kfree(edid); > } > > @@ -778,8 +777,6 @@ intel_hdmi_detect_audio(struct drm_connector *connector) > if (edid) { > if (edid->input & DRM_EDID_INPUT_DIGITAL) > has_audio = drm_detect_monitor_audio(edid); > - > - connector->display_info.raw_edid = NULL; > kfree(edid); > } > > diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c > index 45848b9..7a5238f 100644 > --- a/drivers/gpu/drm/i915/intel_modes.c > +++ b/drivers/gpu/drm/i915/intel_modes.c > @@ -50,7 +50,6 @@ int intel_ddc_get_modes(struct drm_connector *connector, > drm_mode_connector_update_edid_property(connector, edid); > ret = drm_add_edid_modes(connector, edid); > drm_edid_to_eld(connector, edid); > - connector->display_info.raw_edid = NULL; > kfree(edid); > } > > diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c > index d81bb0b..7dad271 100644 > --- a/drivers/gpu/drm/i915/intel_sdvo.c > +++ b/drivers/gpu/drm/i915/intel_sdvo.c > @@ -1345,7 +1345,6 @@ intel_sdvo_tmds_sink_detect(struct drm_connector *connector) > } > } else > status = connector_status_disconnected; > - connector->display_info.raw_edid = NULL; > kfree(edid); > } > > @@ -1419,7 +1418,6 @@ intel_sdvo_detect(struct drm_connector *connector, bool force) > else > ret = connector_status_disconnected; > > - connector->display_info.raw_edid = NULL; > kfree(edid); > } else > ret = connector_status_connected; > @@ -1465,7 +1463,6 @@ static void intel_sdvo_get_ddc_modes(struct drm_connector *connector) > drm_add_edid_modes(connector, edid); > } > > - connector->display_info.raw_edid = NULL; > kfree(edid); > } > } > diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c > index b69642d..c7420e8 100644 > --- a/drivers/gpu/drm/mgag200/mgag200_mode.c > +++ b/drivers/gpu/drm/mgag200/mgag200_mode.c > @@ -1399,7 +1399,6 @@ static int mga_vga_get_modes(struct drm_connector *connector) > if (edid) { > drm_mode_connector_update_edid_property(connector, edid); > ret = drm_add_edid_modes(connector, edid); > - connector->display_info.raw_edid = NULL; > kfree(edid); > } > return ret; > diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c > index ba055e9..2d98ff9 100644 > --- a/drivers/gpu/drm/udl/udl_connector.c > +++ b/drivers/gpu/drm/udl/udl_connector.c > @@ -57,11 +57,8 @@ static int udl_get_modes(struct drm_connector *connector) > > edid = (struct edid *)udl_get_edid(udl); > > - connector->display_info.raw_edid = (char *)edid; > - > drm_mode_connector_update_edid_property(connector, edid); > ret = drm_add_edid_modes(connector, edid); > - connector->display_info.raw_edid = NULL; > kfree(edid); > return ret; > } > diff --git a/drivers/staging/omapdrm/omap_connector.c b/drivers/staging/omapdrm/omap_connector.c > index 5e2856c..9c2287b 100644 > --- a/drivers/staging/omapdrm/omap_connector.c > +++ b/drivers/staging/omapdrm/omap_connector.c > @@ -177,14 +177,11 @@ static int omap_connector_get_modes(struct drm_connector *connector) > drm_mode_connector_update_edid_property( > connector, edid); > n = drm_add_edid_modes(connector, edid); > - kfree(connector->display_info.raw_edid); > - connector->display_info.raw_edid = edid; > } else { > drm_mode_connector_update_edid_property( > connector, NULL); > - connector->display_info.raw_edid = NULL; > - kfree(edid); > } > + kfree(edid); > } else { > struct drm_display_mode *mode = drm_mode_create(dev); > struct omap_video_timings timings; > diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h > index a1a0386..0522044 100644 > --- a/include/drm/drm_crtc.h > +++ b/include/drm/drm_crtc.h > @@ -216,8 +216,6 @@ struct drm_display_info { > u32 color_formats; > > u8 cea_rev; > - > - char *raw_edid; /* if any */ > }; > > struct drm_framebuffer_funcs { > -- > 1.7.4.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2012-08-22 5:18 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-08-11 16:51 [BUG] EDID leaks kernel memory Russell King - ARM Linux 2012-08-13 14:24 ` Daniel Vetter 2012-08-15 9:32 ` [PATCH 0/4] remove raw_edid, and fix related memory leaks Jani Nikula 2012-08-15 9:32 ` [PATCH 1/4] drm/i915: fix EDID memory leak in SDVO Jani Nikula 2012-08-15 22:45 ` Daniel Vetter 2012-08-15 9:32 ` [PATCH 2/4] drm/ast: fix EDID memory leak Jani Nikula 2012-08-15 9:32 ` [PATCH 3/4] drm/exynos: fix EDID memory leak in HDMI Jani Nikula 2012-08-22 4:21 ` InKi Dae 2012-08-15 9:32 ` [PATCH 4/4] drm: remove the raw_edid field from struct drm_display_info Jani Nikula 2012-08-22 5:18 ` InKi Dae
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.