[PATCH v2] drm: vkms: check status of alloc_ordered_workqueue

Kangjie Lu kjlu at umn.edu
Sat Mar 23 21:42:16 UTC 2019


alloc_ordered_workqueue may fail and return NULL.
The fix cleans up drm plans and returns ENOMEM when it fails to
avoid potential NULL pointer dereference.

Signed-off-by: Kangjie Lu <kjlu at umn.edu>
---
V2: clean up resources
---
 drivers/gpu/drm/vkms/vkms_crtc.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c
index 8a9aeb0a9ea8..018b52dd953a 100644
--- a/drivers/gpu/drm/vkms/vkms_crtc.c
+++ b/drivers/gpu/drm/vkms/vkms_crtc.c
@@ -219,6 +219,17 @@ int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc,
 	spin_lock_init(&vkms_out->state_lock);
 
 	vkms_out->crc_workq = alloc_ordered_workqueue("vkms_crc_workq", 0);
+	if (!vkms_out->crc_workq) {
+		ret = -ENOMEM;
+		goto cleanup;
+	}
+
+	return ret;
 
+cleanup:
+	if (!IS_ERR_OR_NULL(cursor))
+		drm_plane_cleanup(cursor);
+	if (!IS_ERR(primary))
+		drm_plane_cleanup(primary);
 	return ret;
 }
-- 
2.17.1



More information about the dri-devel mailing list