diff options
| author |   Chris Wilson <chris@chris-wilson.co.uk> | 2017-07-20 18:45:32 +0100 |
|---|---|---|
| committer |   Jani Nikula <jani.nikula@intel.com> | 2017-07-21 17:45:26 +0300 |
| commit | 967003bb2cae121d345fd807eb757d9422229713 (patch) | |
| tree | 1cf7ce3b548fd15af9c564d7bd2c0a5d6306ce99 /drivers/gpu/drm/drm_dp_helper.c | |
| parent | drm/dp: Fix read pointer for drm_dp_downsteam_debug() (diff) | |
| download | linux-dev-967003bb2cae121d345fd807eb757d9422229713.tar.xz linux-dev-967003bb2cae121d345fd807eb757d9422229713.zip | |
drm/dp: Don't trust drm_dp_downstream_id()
Before we interpret drm_dp_downstream_id() as a string, make sure it is
NULL terminated, even when drm_dp_downtsream_id() fails.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101660
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170720174532.23377-2-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/drm_dp_helper.c')
| -rw-r--r-- | drivers/gpu/drm/drm_dp_helper.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c index 1d9e30f0dbf8..08af8d6b844b 100644 --- a/drivers/gpu/drm/drm_dp_helper.c +++ b/drivers/gpu/drm/drm_dp_helper.c @@ -544,7 +544,7 @@ void drm_dp_downstream_debug(struct seq_file *m, DP_DETAILED_CAP_INFO_AVAILABLE; int clk; int bpc; - char id[6]; + char id[7]; int len; uint8_t rev[2]; int type = port_cap[0] & DP_DS_PORT_TYPE_MASK; @@ -583,6 +583,7 @@ void drm_dp_downstream_debug(struct seq_file *m, seq_puts(m, "\t\tType: N/A\n"); } + memset(id, 0, sizeof(id)); drm_dp_downstream_id(aux, id); seq_printf(m, "\t\tID: %s\n", id); |