diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2016-02-16 14:25:00 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-03 15:07:23 -0800 |
| commit | b78bd121b4978a8378c8300e0fb2e12c88a05a85 (patch) | |
| tree | 22e112ca01a73d7ec4d05eb9db5eb34b50a97493 | |
| parent | 0f44b766c9b773b43e073259933f78d505badcc1 (diff) | |
| download | linux-stable-b78bd121b4978a8378c8300e0fb2e12c88a05a85.tar.gz linux-stable-b78bd121b4978a8378c8300e0fb2e12c88a05a85.tar.bz2 linux-stable-b78bd121b4978a8378c8300e0fb2e12c88a05a85.zip | |
drm/qxl: use kmalloc_array to alloc reloc_info in qxl_process_single_command
commit 34855706c30d52b0a744da44348b5d1cc39fbe51 upstream.
This avoids integer overflows on 32bit machines when calculating
reloc_info size, as reported by Alan Cox.
Cc: gnomes@lxorguk.ukuu.org.uk
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/gpu/drm/qxl/qxl_ioctl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c index 2ae8577497ca..7c2e78201ead 100644 --- a/drivers/gpu/drm/qxl/qxl_ioctl.c +++ b/drivers/gpu/drm/qxl/qxl_ioctl.c @@ -168,7 +168,8 @@ static int qxl_process_single_command(struct qxl_device *qdev, cmd->command_size)) return -EFAULT; - reloc_info = kmalloc(sizeof(struct qxl_reloc_info) * cmd->relocs_num, GFP_KERNEL); + reloc_info = kmalloc_array(cmd->relocs_num, + sizeof(struct qxl_reloc_info), GFP_KERNEL); if (!reloc_info) return -ENOMEM; |