From: Øyvind Harboe <oyvind.harboe@zylin.com>
Date: Mon, 26 Oct 2009 17:53:19 +0000 (+0100)
Subject: target: check args to mrc/mcr.
X-Git-Tag: v0.4.0-rc1~955
X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=4e3c2676f15a130d0594b7c5164ae09f8bd41648;ds=sidebyside

target: check args to mrc/mcr.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
---

diff --git a/src/target/target.c b/src/target/target.c
index d4662f7117..9b07df18bd 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -722,6 +722,30 @@ static int arm_cp_check(struct target_s *target, int cpnum, uint32_t op1, uint32
 		return ERROR_FAIL;
 	}
 
+	if (op1>7)
+	{
+		LOG_ERROR("Illegal op1");
+		return ERROR_FAIL;
+	}
+
+	if (op2>7)
+	{
+		LOG_ERROR("Illegal op2");
+		return ERROR_FAIL;
+	}
+
+	if (CRn>15)
+	{
+		LOG_ERROR("Illegal CRn");
+		return ERROR_FAIL;
+	}
+
+	if (CRm>7)
+	{
+		LOG_ERROR("Illegal CRm");
+		return ERROR_FAIL;
+	}
+
 	return ERROR_OK;
 }