]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
drm/savage: dereferencing an error pointer
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 12 Oct 2016 06:22:27 +0000 (09:22 +0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 13 Oct 2016 05:56:14 +0000 (07:56 +0200)
A recent cleanup changed the kmalloc() + copy_from_user() to
memdup_user() but the error handling wasn't updated so we might call
kfree(-EFAULT) and crash.

Fixes: a6e3918bcdb1 ('GPU-DRM-Savage: Use memdup_user() rather than duplicating')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20161012062227.GU12841@mwanda
drivers/gpu/drm/savage/savage_state.c

index 3dc0d8ff95ec6d1e047d1e27d0587cd5d1cc7199..2db89bed52e80625bee50917652a41c2dc2a5f8d 100644 (file)
@@ -1004,6 +1004,7 @@ int savage_bci_cmdbuf(struct drm_device *dev, void *data, struct drm_file *file_
                kvb_addr = memdup_user(cmdbuf->vb_addr, cmdbuf->vb_size);
                if (IS_ERR(kvb_addr)) {
                        ret = PTR_ERR(kvb_addr);
+                       kvb_addr = NULL;
                        goto done;
                }
                cmdbuf->vb_addr = kvb_addr;