From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=37781 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PIMbH-0006nc-PM
	for qemu-devel@nongnu.org; Tue, 16 Nov 2010 09:33:37 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <avi@redhat.com>) id 1PIMb2-0000lC-M1
	for qemu-devel@nongnu.org; Tue, 16 Nov 2010 09:33:21 -0500
Received: from mx1.redhat.com ([209.132.183.28]:37748)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <avi@redhat.com>) id 1PIMb2-0000l4-FA
	for qemu-devel@nongnu.org; Tue, 16 Nov 2010 09:33:20 -0500
From: Avi Kivity <avi@redhat.com>
Date: Tue, 16 Nov 2010 16:33:17 +0200
Message-Id: <1289917997-27429-1-git-send-email-avi@redhat.com>
Subject: [Qemu-devel] [PATCH] optionrom: fix bugs in signrom.sh
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: Marcelo Tosatti <mtosatti@redhat.com>, kvm@vger.kernel.org

signrom.sh has multiple bugs:

- the last byte is considered when calculating the existing checksum, but not
  when computing the correction
- apprently the 'expr' expression overflows and produces incorrect results with
  larger roms
- if the checksum happened to be zero, we calculated the correction byte to be
  256

Instead of rewriting this in half a line of python, this patch fixes the bugs.

Signed-off-by: Avi Kivity <avi@redhat.com>
---
 pc-bios/optionrom/signrom.sh |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pc-bios/optionrom/signrom.sh b/pc-bios/optionrom/signrom.sh
index 975b27d..9dc5c63 100755
--- a/pc-bios/optionrom/signrom.sh
+++ b/pc-bios/optionrom/signrom.sh
@@ -31,14 +31,13 @@ x=`dd if="$1" bs=1 count=1 skip=2 2>/dev/null | od -t u1 -A n`
 size=$(( $x * 512 - 1 ))
 
 # now get the checksum
-nums=`od -A n -t u1 -v "$1"`
+nums=`od -A n -t u1 -v -N $size "$1"`
 for i in ${nums}; do
     # add each byte's value to sum
-    sum=`expr $sum + $i`
+    sum=`expr \( $sum + $i \) % 256`
 done
 
-sum=$(( $sum % 256 ))
-sum=$(( 256 - $sum ))
+sum=$(( (256 - $sum) % 256 ))
 sum_octal=$( printf "%o" $sum )
 
 # and write the output file
-- 
1.7.3.1