drm: avoid kernel oops in some error paths calling drm_lastclose

Signed-off-by: Dave Airlie <airlied@linux.ie>

drm: avoid kernel oops in some error paths calling drm_lastclose
Signed-off-by: Dave Airlie <airlied@linux.ie>
0a0c721d · Thomas Hellstrom · Dave Airlie · bd5af078 · 0a0c721d
Commit 0a0c721d authored Aug 16, 2006 by Thomas Hellstrom Committed by Dave Airlie Sep 22, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

drivers/char/drm/drm_drv.c drivers/char/drm/drm_drv.c +6 -4

No files found.
--- a/drivers/char/drm/drm_drv.c
+++ b/drivers/char/drm/drm_drv.c
@@ -155,10 +155,12 @@ int drm_lastclose(drm_device_t * dev)
 	del_timer(&dev->timer);
 	/* Clear pid list */
-	list_for_each_entry_safe(pt, next, &dev->magicfree, head) {
+	if (dev->magicfree.next) {
-		list_del(&pt->head);
+		list_for_each_entry_safe(pt, next, &dev->magicfree, head) {
-		drm_ht_remove_item(&dev->magiclist, &pt->hash_item);
+			list_del(&pt->head);
-		drm_free(pt, sizeof(*pt), DRM_MEM_MAGIC);
+			drm_ht_remove_item(&dev->magiclist, &pt->hash_item);
+			drm_free(pt, sizeof(*pt), DRM_MEM_MAGIC);
+		}
 	}
 	/* Clear AGP information */