]>
Commit | Line | Data |
---|---|---|
56a10581 GKH |
1 | From 49ceda9de2da4d1827941d06701f3017c27c1855 Mon Sep 17 00:00:00 2001 |
2 | From: Sean Paul <seanpaul@chromium.org> | |
3 | Date: Fri, 20 Apr 2018 14:59:59 -0400 | |
4 | Subject: drm/bridge: vga-dac: Fix edid memory leak | |
5 | ||
6 | From: Sean Paul <seanpaul@chromium.org> | |
7 | ||
8 | commit 49ceda9de2da4d1827941d06701f3017c27c1855 upstream. | |
9 | ||
10 | edid should be freed once it's finished being used. | |
11 | ||
12 | Fixes: 56fe8b6f4991 ("drm/bridge: Add RGB to VGA bridge support") | |
13 | Cc: Rob Herring <robh@kernel.org> | |
14 | Cc: Sean Paul <seanpaul@chromium.org> | |
15 | Cc: Maxime Ripard <maxime.ripard@free-electrons.com> | |
16 | Cc: Archit Taneja <architt@codeaurora.org> | |
17 | Cc: Andrzej Hajda <a.hajda@samsung.com> | |
18 | Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com> | |
19 | Cc: <stable@vger.kernel.org> # v4.9+ | |
20 | Reviewed-by: Maxime Ripard <maxime.ripard@bootlin.com> | |
21 | Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> | |
22 | Signed-off-by: Sean Paul <seanpaul@chromium.org> | |
23 | Link: https://patchwork.freedesktop.org/patch/msgid/20180420190007.1572-1-seanpaul@chromium.org | |
24 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
25 | ||
26 | --- | |
27 | drivers/gpu/drm/bridge/dumb-vga-dac.c | 4 +++- | |
28 | 1 file changed, 3 insertions(+), 1 deletion(-) | |
29 | ||
30 | --- a/drivers/gpu/drm/bridge/dumb-vga-dac.c | |
31 | +++ b/drivers/gpu/drm/bridge/dumb-vga-dac.c | |
32 | @@ -55,7 +55,9 @@ static int dumb_vga_get_modes(struct drm | |
33 | } | |
34 | ||
35 | drm_mode_connector_update_edid_property(connector, edid); | |
36 | - return drm_add_edid_modes(connector, edid); | |
37 | + ret = drm_add_edid_modes(connector, edid); | |
38 | + kfree(edid); | |
39 | + return ret; | |
40 | ||
41 | fallback: | |
42 | /* |