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

Commit 88498839 authored Jul 27, 2011 by Dan Carpenter Committed by Dave Airlie Aug 04, 2011

drm/radeon: off by one in check_reg() functions



This off by one range check was copy and pasted a couple places.
It's not really harmful, but we should fix it anyway.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

parent b8709894

drivers/gpu/drm/radeon/evergreen_cs.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -428,7 +428,7 @@ static inline int evergreen_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u3
		last_reg = ARRAY_SIZE(evergreen_reg_safe_bm);

		i = (reg >> 7);
		if (i > last_reg) {
		if (i >= last_reg) {
		dev_warn(p->dev, "forbidden register 0x%08x at %d\n", reg, idx);
		return -EINVAL;
		}

drivers/gpu/drm/radeon/r600_cs.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -915,12 +915,11 @@ static inline int r600_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx
		{
		struct r600_cs_track track = (struct r600_cs_track )p->track;
		struct radeon_cs_reloc *reloc;
		u32 last_reg = ARRAY_SIZE(r600_reg_safe_bm);
		u32 m, i, tmp, *ib;
		int r;

		i = (reg >> 7);
		if (i > last_reg) {
		if (i >= ARRAY_SIZE(r600_reg_safe_bm)) {
		dev_warn(p->dev, "forbidden register 0x%08x at %d\n", reg, idx);
		return -EINVAL;
		}