From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Richard W.M. Jones" <rjones@redhat.com>
Subject: [Qemu-devel] [PULL 16/24] scripts/signrom.py: Allow option ROM checksum script to write the size header.
Date: Mon, 23 May 2016 17:09:51 +0200 [thread overview]
Message-ID: <1464016199-43768-17-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1464016199-43768-1-git-send-email-pbonzini@redhat.com>
From: "Richard W.M. Jones" <rjones@redhat.com>
Modify the signrom.py script so that if the size byte in the header is
0 (ie. not set) then the script will set the size. If the size byte
is non-zero then we do the same as before, so this doesn't require
changes to any existing ROM sourcecode.
Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
Message-Id: <1463000807-18015-2-git-send-email-rjones@redhat.com>
---
scripts/signrom.py | 25 ++++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/scripts/signrom.py b/scripts/signrom.py
index f9c35cc..6c8b9bf 100644
--- a/scripts/signrom.py
+++ b/scripts/signrom.py
@@ -18,10 +18,29 @@ fin = open(sys.argv[1], 'rb')
fout = open(sys.argv[2], 'wb')
fin.seek(2)
-size = ord(fin.read(1)) * 512 - 1
-
+size_byte = ord(fin.read(1))
fin.seek(0)
-data = fin.read(size)
+
+if size_byte == 0:
+ # If the caller left the size field blank then we will fill it in,
+ # also rounding the whole input to a multiple of 512 bytes.
+ data = fin.read()
+ # +1 because we need a byte to store the checksum.
+ size = len(data) + 1
+ # Round up to next multiple of 512.
+ size += 511
+ size -= size % 512
+ if size >= 65536:
+ sys.exit("%s: option ROM size too large" % sys.argv[1])
+ # size-1 because a final byte is added below to store the checksum.
+ data = data.ljust(size-1, '\0')
+ data = data[:2] + chr(size/512) + data[3:]
+else:
+ # Otherwise the input file specifies the size so use it.
+ # -1 because we overwrite the last byte of the file with the checksum.
+ size = size_byte * 512 - 1
+ data = fin.read(size)
+
fout.write(data)
checksum = 0
--
1.8.3.1
next prev parent reply other threads:[~2016-05-23 15:10 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-23 15:09 [Qemu-devel] [PULL 00/24] Misc patches for 2016-05-23 Paolo Bonzini
2016-05-23 15:09 ` [Qemu-devel] [PULL 01/24] exec.c: Ensure right alignment also for file backed ram Paolo Bonzini
2016-05-23 15:09 ` [Qemu-devel] [PULL 02/24] docs/atomics.txt: Update pointer to linux macro Paolo Bonzini
2016-05-23 15:09 ` [Qemu-devel] [PULL 03/24] i386: kvmvapic: initialise imm32 variable Paolo Bonzini
2016-05-23 15:09 ` [Qemu-devel] [PULL 04/24] configure: Allow builds with extra warnings Paolo Bonzini
2016-05-23 15:09 ` [Qemu-devel] [PULL 05/24] target-i386: key sfence availability on CPUID_SSE, not CPUID_SSE2 Paolo Bonzini
2016-05-23 15:09 ` [Qemu-devel] [PULL 06/24] ioapic: keep RO bits for IOAPIC entry Paolo Bonzini
2016-05-23 15:09 ` [Qemu-devel] [PULL 07/24] ioapic: clear remote irr bit for edge-triggered interrupts Paolo Bonzini
2016-05-23 15:09 ` [Qemu-devel] [PULL 08/24] vl: change runstate only if new state is different from current state Paolo Bonzini
2016-05-23 15:09 ` [Qemu-devel] [PULL 09/24] memory: drop find_ram_block() Paolo Bonzini
2016-05-23 15:09 ` [Qemu-devel] [PULL 10/24] exec: adjust rcu_read_lock requirement Paolo Bonzini
2016-05-23 15:09 ` [Qemu-devel] [PULL 11/24] memory: Remove code for mr->may_overlap Paolo Bonzini
2016-05-23 15:09 ` [Qemu-devel] [PULL 12/24] memory: Drop FlatRange.romd_mode Paolo Bonzini
2016-05-23 15:09 ` [Qemu-devel] [PULL 13/24] memory: remove unnecessary masking of MemoryRegion ram_addr Paolo Bonzini
2016-05-23 15:09 ` [Qemu-devel] [PULL 14/24] cpus.c: Use pthread_sigmask() rather than sigprocmask() Paolo Bonzini
2016-05-23 15:09 ` [Qemu-devel] [PULL 15/24] Remove config-devices.mak on 'make clean' Paolo Bonzini
2016-05-23 15:09 ` Paolo Bonzini [this message]
2016-05-23 15:09 ` [Qemu-devel] [PULL 17/24] scripts/signrom.py: Check for magic in option ROMs Paolo Bonzini
2016-05-23 15:09 ` [Qemu-devel] [PULL 18/24] esp: check command buffer length before write(CVE-2016-4439) Paolo Bonzini
2016-05-23 15:09 ` [Qemu-devel] [PULL 19/24] esp: check dma length before reading scsi command(CVE-2016-4441) Paolo Bonzini
2016-05-23 15:09 ` [Qemu-devel] [PULL 20/24] iscsi: pass SCSI status back for SG_IO Paolo Bonzini
2016-05-23 15:09 ` [Qemu-devel] [PULL 21/24] coccinelle: add g_assert_cmp* to macro file Paolo Bonzini
2016-05-23 15:09 ` [Qemu-devel] [PULL 22/24] target-i386: add a generic x86 nmi handler Paolo Bonzini
2016-05-23 15:09 ` [Qemu-devel] [PULL 23/24] nmi: remove x86 specific nmi handling Paolo Bonzini
2016-05-23 15:09 ` [Qemu-devel] [PULL 24/24] cpus: call the core nmi injection function Paolo Bonzini
2016-05-23 16:16 ` [Qemu-devel] [PULL 00/24] Misc patches for 2016-05-23 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1464016199-43768-17-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rjones@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).