diff options
| author | Gen Zhang <blackgod016574@gmail.com> | 2019-05-24 04:32:22 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2019-05-24 20:01:33 +0200 |
| commit | 9f1f1a2dab38d4ce87a13565cf4dc1b73bef3a5f (patch) | |
| tree | d33e926240b2a662613446b16bed56ad10d5f68e | |
| parent | drm/mcde: Add new driver for ST-Ericsson MCDE (diff) | |
| download | linux-9f1f1a2dab38d4ce87a13565cf4dc1b73bef3a5f.tar.xz linux-9f1f1a2dab38d4ce87a13565cf4dc1b73bef3a5f.zip | |
drm/edid: Fix a missing-check bug in drm_load_edid_firmware()
In drm_load_edid_firmware(), fwstr is allocated by kstrdup(). And fwstr
is dereferenced in the following codes. However, memory allocation
functions such as kstrdup() may fail and returns NULL. Dereferencing
this null pointer may cause the kernel go wrong. Thus we should check
this kstrdup() operation.
Further, if kstrdup() returns NULL, we should return ERR_PTR(-ENOMEM) to
the caller site.
Signed-off-by: Gen Zhang <blackgod016574@gmail.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190524023222.GA5302@zhanggen-UX430UQ
| -rw-r--r-- | drivers/gpu/drm/drm_edid_load.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c index 18d52dc4b21d..2e8d043fc7e5 100644 --- a/drivers/gpu/drm/drm_edid_load.c +++ b/drivers/gpu/drm/drm_edid_load.c @@ -293,6 +293,8 @@ struct edid *drm_load_edid_firmware(struct drm_connector *connector) * the last one found one as a fallback. */ fwstr = kstrdup(edid_firmware, GFP_KERNEL); + if (!fwstr) + return ERR_PTR(-ENOMEM); edidstr = fwstr; while ((edidname = strsep(&edidstr, ","))) { |