drm: simpledrm: fix a potential NULL dereference
Subsystems (3)
PATCH 1/1 drm: simpledrm: fix a potential NULL dereference
The drm_format_info() function returns NULL if the format is unsupported, but the simplefb_get_validated_format() is expected to return error pointers. If we propagate teh NULL return then it will lead to a NULL dereference in the callers. Swap the NULL and trade it in for an ERR_PTR(-EINVAL).
--- drivers/gpu/drm/tiny/simpledrm.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/tiny/simpledrm.c +7 -2
@@ -72,6 +72,7 @@ simplefb_get_validated_format(struct drm_device *dev, const char *format_name)static const struct simplefb_format formats[] =SIMPLEFB_FORMATS ;const struct simplefb_format *fmt = formats;const struct simplefb_format *end = fmt +ARRAY_SIZE (formats); +const struct drm_format_info *info;if (!format_name) {drm_err (dev,"simplefb: missing framebuffer format\n" );
@@ -79,8 +80,12 @@ simplefb_get_validated_format(struct drm_device *dev, const char *format_name) }while (fmt < end) { -if (!strcmp (format_name, fmt->name)) -return drm_format_info (fmt->fourcc); +if (!strcmp (format_name, fmt->name)) { + info =drm_format_info (fmt->fourcc); +if (!info) +return ERR_PTR (-EINVAL ); +return info; + } ++fmt; }
Signature · 1 line
2.30.2
Thomas Zimmermann
maintainerAm 15.05.21 um 11:53 schrieb Dan Carpenter:
Quoted 5 lines
The
drm_format_info()function returns NULL if the format is unsupported, but thesimplefb_get_validated_format()is expected to return error pointers. If we propagate teh NULL return then it will lead to a NULL dereference in the callers. Swap the NULL and trade it in for anERR_PTR(-EINVAL).
Thank you. I've added the patch to drm-misc-next.
Best regards
Thomas
drivers/gpu/drm/tiny/simpledrm.c simplefb_get_validated_format(struct drm_device *dev,
Quoted 12 lines
Fixes 11e8f5fd223b ("drm: Add simpledrm driver")Signed-off-by Dan Carpenter <[email protected]>--- drivers/gpu/drm/tiny/simpledrm.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)drivers/gpu/drm/tiny/simpledrm.c +0
-0@@ -72,6 +72,7 @@ simplefb_get_validated_format(struct drm_device *dev,
const char *format_name)
Quoted 23 lines
drivers/gpu/drm/tiny/simpledrm.c +7
-2static const struct simplefb_format formats[] =SIMPLEFB_FORMATS ;const struct simplefb_format *fmt = formats;const struct simplefb_format *end = fmt +ARRAY_SIZE (formats); +const struct drm_format_info *info;if (!format_name) {drm_err (dev,"simplefb: missing framebuffer format\n" );@@ -79,8 +80,12 @@ simplefb_get_validated_format(struct drm_device *dev, const char *format_name) }while (fmt < end) { -if (!strcmp (format_name, fmt->name)) -return drm_format_info (fmt->fourcc); +if (!strcmp (format_name, fmt->name)) { + info =drm_format_info (fmt->fourcc); +if (!info) +return ERR_PTR (-EINVAL ); +return info; + } ++fmt; }
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer