Add qemu_get_counted_string
v2 cover Add qemu_get_counted_string
From: "Dr. David Alan Gilbert" <[email protected]>
Move the reading of length first encoded strings into it's own function.
v2:
Terminate return buffer at read length rather than expected length
Dr. David Alan Gilbert (1):
Add qemu_get_counted_string to read a string prefixed by a count byte
arch_init.c | 9 +++++---- include/migration/qemu-file.h | 3 +++ migration/qemu-file.c | 17 +++++++++++++++++ savevm.c | 11 ++++++----- 4 files changed, 31 insertions(+), 9 deletions(-)
Signature · 1 line
2.4.1
PATCH v2 1/1 Add qemu_get_counted_string to read a string prefixed by a count byte
From: "Dr. David Alan Gilbert" <[email protected]>
and use it in loadvm_state and ram_load.
Where ever it's used, check the return and error if it failed.
Minor: ram_load was using a 257 byte array for its string, the
maximum length is 255 bytes + 0 terminator, so fix to 256
--- arch_init.c | 9 +++++---- include/migration/qemu-file.h | 3 +++ migration/qemu-file.c | 17 +++++++++++++++++ savevm.c | 11 ++++++----- 4 files changed, 31 insertions(+), 9 deletions(-)
arch_init.c +5 -4
@@ -1593,13 +1593,14 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) total_ram_bytes = addr;while (!ret && total_ram_bytes) {RAMBlock *block; -uint8_t len;char id[256 ];ram_addr_t length; - len =qemu_get_byte (f); -qemu_get_buffer (f, (uint8_t *)id, len); - id[len] =0 ; +if (!qemu_get_counted_string (f, id)) { +error_report ("Failed to read ID string of RAM Block" ); + ret = -EINVAL ; +break ; + } length =qemu_get_be64 (f); QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {
include/migration/qemu-file.h +3 -0
@@ -312,4 +312,7 @@ static inline void qemu_get_sbe64s(QEMUFile *f, int64_t *pv) {qemu_get_be64s (f, (uint64_t *)pv); } + +size_t qemu_get_counted_string (QEMUFile *f,char buf[256 ]); +#endif
migration/qemu-file.c +17 -0
@@ -585,3 +585,20 @@ int qemu_put_qemu_file(QEMUFile *f_des, QEMUFile *f_src) }return len; } + +/* +* Get a string whose length is determined by a single preceding byte +* A preallocated 256 byte buffer must be passed in. +* Returns: len on success and a 0 terminated string in the buffer +* else 0 +* (Note a 0 length string will return 0 either way) +*/ +size_t qemu_get_counted_string (QEMUFile *f,char buf[256 ]) +{ +size_t len =qemu_get_byte (f); +size_t res =qemu_get_buffer (f, (uint8_t *)buf, len); + + buf[res] =0 ; + +return res == len ? res :0 ; +}
savevm.c +6 -5
@@ -964,8 +964,7 @@ int qemu_loadvm_state(QEMUFile *f)while ((section_type =qemu_get_byte (f)) !=QEMU_VM_EOF ) {uint32_t instance_id, version_id, section_id;SaveStateEntry *se; -char idstr[257 ]; -int len; +char idstr[256 ];trace_qemu_loadvm_state_section (section_type);switch (section_type) {
@@ -973,9 +972,11 @@ int qemu_loadvm_state(QEMUFile *f)case QEMU_VM_SECTION_FULL :/* Read section start */ section_id =qemu_get_be32 (f); - len =qemu_get_byte (f); -qemu_get_buffer (f, (uint8_t *)idstr, len); - idstr[len] =0 ; +if (!qemu_get_counted_string (f, idstr)) { +error_report ("Unable to read ID string for section %u" , + section_id); +return -EINVAL ; + } instance_id =qemu_get_be32 (f); version_id =qemu_get_be32 (f);
Signature · 1 line
2.4.1
Re: [Qemu-devel] [PATCH v2 1/1] Add qemu_get_counted_string to read a string prefixed by a count byte
Quoted 10 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
and use it in
loadvm_stateandram_load.Where ever it's used, check the return and error if it failed.
Minor:
ram_loadwas using a 257 byte array for its string, the
maximum length is 255 bytes + 0 terminator, so fix to 256Signed-off-by Dr. David Alan Gilbert <[email protected]>
Amit