From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39222) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqPnK-0003zj-7D for qemu-devel@nongnu.org; Mon, 17 Nov 2014 12:08:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XqPnE-0006Bj-7Q for qemu-devel@nongnu.org; Mon, 17 Nov 2014 12:08:54 -0500 Received: from mail-wg0-x234.google.com ([2a00:1450:400c:c00::234]:50290) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqPnE-0006Ba-1B for qemu-devel@nongnu.org; Mon, 17 Nov 2014 12:08:48 -0500 Received: by mail-wg0-f52.google.com with SMTP id a1so1785150wgh.11 for ; Mon, 17 Nov 2014 09:08:47 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 17 Nov 2014 18:08:18 +0100 Message-Id: <1416244099-7217-12-git-send-email-pbonzini@redhat.com> In-Reply-To: <1416244099-7217-1-git-send-email-pbonzini@redhat.com> References: <1416244099-7217-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 11/12] target-cris/translate.c: fix out of bounds read List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: zhanghailiang From: zhanghailiang In function t_gen_mov_TN_preg and t_gen_mov_preg_TN, The begin check about the validity of in-parameter 'r' is useless. We still access cpu_PR[r] in the follow code if it is invalid. Which will be an out-of-bounds read error. Fix it by using assert() to ensure it is valid before using it. Signed-off-by: zhanghailiang Signed-off-by: Paolo Bonzini --- target-cris/translate.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/target-cris/translate.c b/target-cris/translate.c index e37b04e..76406af 100644 --- a/target-cris/translate.c +++ b/target-cris/translate.c @@ -169,9 +169,7 @@ static int preg_sizes[] = { static inline void t_gen_mov_TN_preg(TCGv tn, int r) { - if (r < 0 || r > 15) { - fprintf(stderr, "wrong register read $p%d\n", r); - } + assert(r >= 0 && r <= 15); if (r == PR_BZ || r == PR_WZ || r == PR_DZ) { tcg_gen_mov_tl(tn, tcg_const_tl(0)); } else if (r == PR_VR) { @@ -182,9 +180,7 @@ static inline void t_gen_mov_TN_preg(TCGv tn, int r) } static inline void t_gen_mov_preg_TN(DisasContext *dc, int r, TCGv tn) { - if (r < 0 || r > 15) { - fprintf(stderr, "wrong register write $p%d\n", r); - } + assert(r >= 0 && r <= 15); if (r == PR_BZ || r == PR_WZ || r == PR_DZ) { return; } else if (r == PR_SRS) { -- 1.8.3.1