[PATCH] drm/omap: Don't dereference list head when the connectors list is empty

Laurent Pinchart laurent.pinchart at ideasonboard.com
Mon Dec 23 07:27:53 PST 2013


The connectors list iterator returns the list head when the list is
empty. Fix it by returning NULL in that case.

Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
---
 drivers/gpu/drm/omapdrm/omap_fb.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c
index f2b8f06..1b48cf2 100644
--- a/drivers/gpu/drm/omapdrm/omap_fb.c
+++ b/drivers/gpu/drm/omapdrm/omap_fb.c
@@ -301,8 +301,11 @@ struct drm_connector *omap_framebuffer_get_next_connector(
 	struct list_head *connector_list = &dev->mode_config.connector_list;
 	struct drm_connector *connector = from;
 
-	if (!from)
+	if (!from) {
+		if (list_empty(connector_list))
+			return NULL;
 		return list_first_entry(connector_list, typeof(*from), head);
+	}
 
 	list_for_each_entry_from(connector, connector_list, head) {
 		if (connector != from) {
-- 
1.8.3.2



More information about the dri-devel mailing list