diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2016-02-16 14:25:00 +0100 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-03-04 10:18:43 -0500 |
| commit | c3a0841ee9ac07d51f3823f6fa441f28a182b283 (patch) | |
| tree | d95fff684ce495c5c67003a8cd0e958088569333 | |
| parent | 327a38a4a2d3de61e04c77388d630cfa46ef13bf (diff) | |
| download | lwn-c3a0841ee9ac07d51f3823f6fa441f28a182b283.tar.gz lwn-c3a0841ee9ac07d51f3823f6fa441f28a182b283.zip | |
drm/qxl: use kmalloc_array to alloc reloc_info in qxl_process_single_command
[ Upstream commit 34855706c30d52b0a744da44348b5d1cc39fbe51 ]
This avoids integer overflows on 32bit machines when calculating
reloc_info size, as reported by Alan Cox.
Cc: stable@vger.kernel.org
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: Sasha Levin <sasha.levin@oracle.com>
| -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 7354a4cda59d..3aefaa058f0c 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; |