From: Valentin Longchamp Date: Tue, 14 Aug 2012 01:16:36 +0000 (+0000) Subject: km/ivm: fix string len check to support 7 char board names X-Git-Tag: v2012.10-rc1~2^2~26 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=62c9b9603e2552d6b39985738a957b51b0367e72;p=u-boot km/ivm: fix string len check to support 7 char board names The fanless boards now have a 7-digit (XXXXX-F) board name. This triggers a border condition when reading this string in the IVM although this string is smaller than the currenly read string size, but only by 1 character. This patch corrects this by changing the size check condition for string length. It is the same change that was done in the platform for this same bug. Signed-off-by: Valentin Longchamp cc: Holger Brunck cc: Stefan Bigler --- diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c index 9bc3c21c9c..eaa924f0e6 100644 --- a/board/keymile/common/ivm.c +++ b/board/keymile/common/ivm.c @@ -163,7 +163,7 @@ static int ivm_findinventorystring(int type, if (addr == INVENTORYDATASIZE) { xcode = -1; printf("Error end of string not found\n"); - } else if ((size >= (maxlen - 1)) && + } else if ((size > (maxlen - 1)) && (buf[addr] != '\r')) { xcode = -1; printf("string too long till next CR\n");