Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b421ed15 authored by Michel Dänzer's avatar Michel Dänzer Committed by Alex Deucher
Browse files

drm/radeon: Use drm_calloc_ab for CS relocs 



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

Cc: stable@vger.kernel.org
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 59fd7e4b

drivers/gpu/drm/radeon/radeon_cs.c

+2 −2
Original line number Diff line number Diff line
@@ -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);