]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
drm/edid: Fix a missing-check bug in drm_load_edid_firmware()
authorGen Zhang <blackgod016574@gmail.com>
Fri, 24 May 2019 02:32:22 +0000 (10:32 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 31 Jul 2019 05:24:34 +0000 (07:24 +0200)
[ Upstream commit 9f1f1a2dab38d4ce87a13565cf4dc1b73bef3a5f ]

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
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/drm_edid_load.c

index 1e5593575d232c2cdcf8d9533eace20b64e95da4..6192b7b20d8461895d6ddf51cf98352d8eb848ac 100644 (file)
@@ -278,6 +278,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, ","))) {