]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/vkms: Fix use after free and double free on init error
authorJosé Expósito <jose.exposito89@gmail.com>
Wed, 12 Feb 2025 08:49:12 +0000 (09:49 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Apr 2025 12:39:14 +0000 (14:39 +0200)
[ Upstream commit ed15511a773df86205bda66c37193569575ae828 ]

If the driver initialization fails, the vkms_exit() function might
access an uninitialized or freed default_config pointer and it might
double free it.

Fix both possible errors by initializing default_config only when the
driver initialization succeeded.

Reported-by: Louis Chauvet <louis.chauvet@bootlin.com>
Closes: https://lore.kernel.org/all/Z5uDHcCmAwiTsGte@louis-chauvet-laptop/
Fixes: 2df7af93fdad ("drm/vkms: Add vkms_config type")
Signed-off-by: José Expósito <jose.exposito89@gmail.com>
Reviewed-by: Thomas Zimmermann <tzimmremann@suse.de>
Reviewed-by: Louis Chauvet <louis.chauvet@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250212084912.3196-1-jose.exposito89@gmail.com
Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/vkms/vkms_drv.c

index 0c1a713b7b7b3bc61f7a23ae4f240f0233d937a5..be642ee739c4fb2a46347a7feee988615efe5a39 100644 (file)
@@ -245,17 +245,19 @@ static int __init vkms_init(void)
        if (!config)
                return -ENOMEM;
 
-       default_config = config;
-
        config->cursor = enable_cursor;
        config->writeback = enable_writeback;
        config->overlay = enable_overlay;
 
        ret = vkms_create(config);
-       if (ret)
+       if (ret) {
                kfree(config);
+               return ret;
+       }
 
-       return ret;
+       default_config = config;
+
+       return 0;
 }
 
 static void vkms_destroy(struct vkms_config *config)
@@ -279,9 +281,10 @@ static void vkms_destroy(struct vkms_config *config)
 
 static void __exit vkms_exit(void)
 {
-       if (default_config->dev)
-               vkms_destroy(default_config);
+       if (!default_config)
+               return;
 
+       vkms_destroy(default_config);
        kfree(default_config);
 }