Linux kernel -stable discussions
 help / color / mirror / Atom feed
* [PATCH v2] qxl: use kmalloc_array to alloc reloc_info in qxl_process_single_command
@ 2016-02-16 13:25 Gerd Hoffmann
  2016-02-16 14:23 ` Daniel Vetter
  0 siblings, 1 reply; 2+ messages in thread
From: Gerd Hoffmann @ 2016-02-16 13:25 UTC (permalink / raw)
  To: David Airlie
  Cc: Daniel Vetter, Gerd Hoffmann, stable, gnomes,
	open list:DRM DRIVERS, open list

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>
---
 drivers/gpu/drm/qxl/qxl_ioctl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
index 2ae8577..7c2e782 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;
 
-- 
1.8.3.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH v2] qxl: use kmalloc_array to alloc reloc_info in qxl_process_single_command
  2016-02-16 13:25 [PATCH v2] qxl: use kmalloc_array to alloc reloc_info in qxl_process_single_command Gerd Hoffmann
@ 2016-02-16 14:23 ` Daniel Vetter
  0 siblings, 0 replies; 2+ messages in thread
From: Daniel Vetter @ 2016-02-16 14:23 UTC (permalink / raw)
  To: Gerd Hoffmann
  Cc: David Airlie, Daniel Vetter, stable, gnomes,
	open list:DRM DRIVERS, open list

On Tue, Feb 16, 2016 at 02:25:00PM +0100, Gerd Hoffmann wrote:
> 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>

> ---
>  drivers/gpu/drm/qxl/qxl_ioctl.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
> index 2ae8577..7c2e782 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;
>  
> -- 
> 1.8.3.1
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-02-16 14:23 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-16 13:25 [PATCH v2] qxl: use kmalloc_array to alloc reloc_info in qxl_process_single_command Gerd Hoffmann
2016-02-16 14:23 ` Daniel Vetter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox