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

Commit ff4bd082 authored by Ilija Hadzic's avatar Ilija Hadzic Committed by Alex Deucher
Browse files

drm/radeon: fix NULL pointer dereference in UMS mode 



In UMS mode parser->rdev is NULL, so dereferencing
will cause an oops.

Signed-off-by: default avatarIlija Hadzic <ihadzic@research.bell-labs.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 82ba789f

drivers/gpu/drm/radeon/radeon_cs.c

+3 −2
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data) 
				  p->chunks[p->chunk_ib_idx].length_dw);

			return -EINVAL;

		}

		if ((p->rdev->flags & RADEON_IS_AGP)) {

		if (p->rdev && (p->rdev->flags & RADEON_IS_AGP)) {

			p->chunks[p->chunk_ib_idx].kpage[0] = kmalloc(PAGE_SIZE, GFP_KERNEL);

			p->chunks[p->chunk_ib_idx].kpage[1] = kmalloc(PAGE_SIZE, GFP_KERNEL);

			if (p->chunks[p->chunk_ib_idx].kpage[0] == NULL ||
@@ -583,7 +583,8 @@ static int radeon_cs_update_pages(struct radeon_cs_parser *p, int pg_idx) 
	struct radeon_cs_chunk *ibc = &p->chunks[p->chunk_ib_idx];

	int i;

	int size = PAGE_SIZE;

	bool copy1 = (p->rdev->flags & RADEON_IS_AGP) ? false : true;

	bool copy1 = (p->rdev && (p->rdev->flags & RADEON_IS_AGP)) ?

		false : true;



	for (i = ibc->last_copied_page + 1; i < pg_idx; i++) {

		if (DRM_COPY_FROM_USER(p->ib.ptr + (i * (PAGE_SIZE/4)),