Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89f3f356 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Daniel Vetter
Browse files

drm/fb-helper: Fix potential NULL pointer dereference 



fb_helper is being dereferenced before it is null checked,
hence there is a potential null pointer dereference.

Fix this by moving the pointer dereference after fb_helper
has been null checked.

This issue was detected with the help of Coccinelle.

Fixes: c777990f ("drm/fb-helper: Handle function NULL argument")
Signed-off-by: default avatarGustavo A. R. Silva <garsilva@embeddedor.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20171205174628.GA31189@embeddedor.com
parent ec17f034

drivers/gpu/drm/drm_fb_helper.c

+3 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ EXPORT_SYMBOL(drm_fb_helper_add_one_connector); 
 */

int drm_fb_helper_single_add_all_connectors(struct drm_fb_helper *fb_helper)

{

	struct drm_device *dev = fb_helper->dev;

	struct drm_device *dev;

	struct drm_connector *connector;

	struct drm_connector_list_iter conn_iter;

	int i, ret = 0;
@@ -186,6 +186,8 @@ int drm_fb_helper_single_add_all_connectors(struct drm_fb_helper *fb_helper) 
	if (!drm_fbdev_emulation || !fb_helper)

		return 0;



	dev = fb_helper->dev;



	mutex_lock(&fb_helper->lock);

	drm_connector_list_iter_begin(dev, &conn_iter);

	drm_for_each_connector_iter(connector, &conn_iter) {