drm/nouveau/fbcon: fix module unload when fbcon init has failed for some reason

Ben Skeggs · gregkh · commit 5955ccb5a46d · 2020-08-11T15:33:36.000+02:00
[ Upstream commit 498595a ] Stale pointer was tripping up the unload path. Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -592,6 +592,7 @@ nouveau_fbcon_init(struct drm_device *dev)
 	drm_fb_helper_fini(&fbcon->helper);
 free:
 	kfree(fbcon);
+	drm->fbcon = NULL;
 	return ret;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -592,6 +592,7 @@ nouveau_fbcon_init(struct drm_device *dev)`
`592`	`592`	`drm_fb_helper_fini(&fbcon->helper);`
`593`	`593`	`free:`
`594`	`594`	`kfree(fbcon);`
	`595`	`+ drm->fbcon = NULL;`
`595`	`596`	`return ret;`
`596`	`597`	`}`
`597`	`598`