From 140fe7f7145cb1159e9f530067e8acc62a3584b3 Mon Sep 17 00:00:00 2001
From: Christopher Head <chead@zaber.com>
Date: Tue, 3 Mar 2020 13:25:50 -0800
Subject: [PATCH] flash/nor: check fill pattern fits in word size

Change-Id: Idad527a428ceed2b53f3da41fb0c64bf8e62614a
Signed-off-by: Christopher Head <chead@zaber.com>
Reviewed-on: http://openocd.zylin.com/5492
Tested-by: jenkins
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-by: Tarek BOCHKATI <tarek.bouchkati@gmail.com>
---
 src/flash/nor/tcl.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/flash/nor/tcl.c b/src/flash/nor/tcl.c
index 3287dd97f1..40105b43f7 100644
--- a/src/flash/nor/tcl.c
+++ b/src/flash/nor/tcl.c
@@ -512,6 +512,11 @@ COMMAND_HANDLER(handle_flash_fill_command)
 			return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
+	if ((wordsize < sizeof(pattern)) && (pattern >> (8 * wordsize) != 0)) {
+		command_print(CMD, "Fill pattern 0x%" PRIx64 " does not fit within %" PRIu32 "-byte word", pattern, wordsize);
+		return ERROR_FAIL;
+	}
+
 	if (count == 0)
 		return ERROR_OK;
 
-- 
2.30.2