diff options
author | Damien Lespiau <damien.lespiau@intel.com> | 2014-03-03 23:59:07 +0000 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-03-17 11:23:07 +0100 |
commit | 409bbf1e3da29aaf57b520e29f904db9c7c2475e (patch) | |
tree | 03c20d00e2f73e69d798a44720e746b104bb3c39 /drivers/gpu/drm/drm_edid.c | |
parent | 366d48070008a0846a099b23efef297451b05640 (diff) | |
download | op-kernel-dev-409bbf1e3da29aaf57b520e29f904db9c7c2475e.zip op-kernel-dev-409bbf1e3da29aaf57b520e29f904db9c7c2475e.tar.gz |
drm: Check if the allocation has succeeded before dereferencing newmode
We allocate memory in drm_display_mode_from_vic_index() and use it
without checking the pointer is valid. Fix that.
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/drm_edid.c')
-rw-r--r-- | drivers/gpu/drm/drm_edid.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index f8d8a1d..f3cde90 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -2580,6 +2580,9 @@ drm_display_mode_from_vic_index(struct drm_connector *connector, return NULL; newmode = drm_mode_duplicate(dev, &edid_cea_modes[cea_mode]); + if (!newmode) + return NULL; + newmode->vrefresh = 0; return newmode; |