diff options
| author | Maciej Purski <m.purski@samsung.com> | 2017-09-05 14:23:02 +0200 |
|---|---|---|
| committer | Inki Dae <inki.dae@samsung.com> | 2017-09-20 12:05:23 +0900 |
| commit | 04fc52fb222d35e1f7a0d5d85b19a676ea1e10e8 (patch) | |
| tree | 66297c930d1db09cf60cbf3373f61e7a6fa1919b /drivers/gpu/drm/exynos | |
| parent | 9ac30ef6d8ec3533d0feec53e268c4fa32ea700c (diff) | |
| download | linux-stable-04fc52fb222d35e1f7a0d5d85b19a676ea1e10e8.tar.gz linux-stable-04fc52fb222d35e1f7a0d5d85b19a676ea1e10e8.tar.bz2 linux-stable-04fc52fb222d35e1f7a0d5d85b19a676ea1e10e8.zip | |
drm/exynos/hdmi: Fix unsafe list iteration
Function hdmi_mode_fixup() used bare list_for_each entry, which was
unsafe and caused memory corruption detected by kasan.
It now uses drm_for_each_connector_iter macro, which is now recommended
by the documentation and safe.
Signed-off-by: Maciej Purski <m.purski@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Diffstat (limited to 'drivers/gpu/drm/exynos')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_hdmi.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index 214fa5e51963..0109ff40b1db 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -944,22 +944,27 @@ static bool hdmi_mode_fixup(struct drm_encoder *encoder, struct drm_device *dev = encoder->dev; struct drm_connector *connector; struct drm_display_mode *m; + struct drm_connector_list_iter conn_iter; int mode_ok; drm_mode_set_crtcinfo(adjusted_mode, 0); - list_for_each_entry(connector, &dev->mode_config.connector_list, head) { + drm_connector_list_iter_begin(dev, &conn_iter); + drm_for_each_connector_iter(connector, &conn_iter) { if (connector->encoder == encoder) break; } + if (connector) + drm_connector_get(connector); + drm_connector_list_iter_end(&conn_iter); - if (connector->encoder != encoder) + if (!connector) return true; mode_ok = hdmi_mode_valid(connector, adjusted_mode); if (mode_ok == MODE_OK) - return true; + goto cleanup; /* * Find the most suitable mode and copy it to adjusted_mode. @@ -979,6 +984,9 @@ static bool hdmi_mode_fixup(struct drm_encoder *encoder, } } +cleanup: + drm_connector_put(connector); + return true; } |