[PATCH] drm/radeon: Use drm_calloc_ab for CS relocs

[Michel Dänzer]

On 16.04.2015 11:17, Michel Dänzer wrote:
> From: Michel Dänzer 
> 
> The number of relocs is passed in by userspace and can be large. It has
> been observed to cause kmalloc failures in the wild.

That should of course say 'kcalloc failures'.


-- 
Earthling Michel Dänzer   |   http://www.amd.com
Libre software enthusiast | Mesa and X developer

[PATCH] drm/radeon: Use drm_calloc_ab for CS relocs

[Michel Dänzer]

From: Michel Dänzer 

The number of relocs is passed in by userspace and can be large. It has
been observed to cause kmalloc failures in the wild.

Cc: stable at vger.kernel.org
Signed-off-by: Michel Dänzer 
---
 drivers/gpu/drm/radeon/radeon_cs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_cs.c 
b/drivers/gpu/drm/radeon/radeon_cs.c
index 4d0f96c..ab39b85 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -88,7 +88,7 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
p->dma_reloc_idx = 0;
/* FIXME: we assume that each relocs use 4 dwords */
p->nrelocs = chunk->length_dw / 4;
-   p->relocs = kcalloc(p->nrelocs, sizeof(struct radeon_bo_list), 
GFP_KERNEL);
+   p->relocs = drm_calloc_large(p->nrelocs, sizeof(struct radeon_bo_list));
if (p->relocs == NULL) {
return -ENOMEM;
}
@@ -428,7 +428,7 @@ static void radeon_cs_parser_fini(struct radeon_cs_parser 
*parser, int error, bo
}
}
kfree(parser->track);
-   kfree(parser->relocs);
+   drm_free_large(parser->relocs);
drm_free_large(parser->vm_bos);
for (i = 0; i < parser->nchunks; i++)
drm_free_large(parser->chunks[i].kdata);
-- 
2.1.4

[PATCH] drm/radeon: Use drm_calloc_ab for CS relocs

[Alex Deucher]

On Thu, Apr 16, 2015 at 3:58 AM, Christian König
 wrote:
> On 16.04.2015 04:30, Michel Dänzer wrote:
>>
>> On 16.04.2015 11:17, Michel Dänzer wrote:
>>>
>>> From: Michel Dänzer 
>>>
>>> The number of relocs is passed in by userspace and can be large. It has
>>> been observed to cause kmalloc failures in the wild.
>>
>> That should of course say 'kcalloc failures'.
>
>
> Yeah, with that fixed in the commit message the patch is Reviewed-by:
> Christian König 


Applied with the commit message fixed.

Alex

>
> Regards,
> Christian.
>
> ___
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH] drm/radeon: Use drm_calloc_ab for CS relocs

[Christian König]

On 16.04.2015 04:30, Michel Dänzer wrote:
> On 16.04.2015 11:17, Michel Dänzer wrote:
>> From: Michel Dänzer 
>>
>> The number of relocs is passed in by userspace and can be large. It has
>> been observed to cause kmalloc failures in the wild.
> That should of course say 'kcalloc failures'.

Yeah, with that fixed in the commit message the patch is Reviewed-by: 
Christian König 

Regards,
Christian.