]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm: crtc: integer overflow in drm_property_create_blob()
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 29 Oct 2015 13:37:54 +0000 (16:37 +0300)
committerZefan Li <lizefan@huawei.com>
Wed, 27 Apr 2016 10:55:22 +0000 (18:55 +0800)
commit 9ac0934bbe52290e4e4c2a58ec41cab9b6ca8c96 upstream.

The size here comes from the user via the ioctl, it is a number between
1-u32max so the addition here could overflow on 32 bit systems.

Fixes: f453ba046074 ('DRM: add mode setting support')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Dave Airlie <airlied@gmail.com>
[lizf: Backported to 3.4: adjust context]
Signed-off-by: Zefan Li <lizefan@huawei.com>
drivers/gpu/drm/drm_crtc.c

index ed4b7481a865cd8adc83278a9ae0dc7ef6606153..93c5b2fdf9b40751e2a0ec3476b2dcc6bcad3a0d 100644 (file)
@@ -2945,7 +2945,7 @@ static struct drm_property_blob *drm_property_create_blob(struct drm_device *dev
        struct drm_property_blob *blob;
        int ret;
 
-       if (!length || !data)
+       if (!length || length > ULONG_MAX - sizeof(struct drm_property_blob) || !data)
                return NULL;
 
        blob = kzalloc(sizeof(struct drm_property_blob)+length, GFP_KERNEL);