|
 |
958e1b |
From 9c1134e8923157059587541b4f318e63ad8c39fe Mon Sep 17 00:00:00 2001
|
|
|
958e1b |
From: Laszlo Ersek <lersek@redhat.com>
|
|
|
958e1b |
Date: Fri, 7 Nov 2014 17:17:49 +0100
|
|
|
958e1b |
Subject: [PATCH 02/41] dump-guest-memory: Check for the correct return value
|
|
|
958e1b |
|
|
|
958e1b |
Message-id: <1415380693-16593-3-git-send-email-lersek@redhat.com>
|
|
|
958e1b |
Patchwork-id: 62188
|
|
|
958e1b |
O-Subject: [RHEL-7.1 qemu-kvm PATCH 02/26] dump-guest-memory: Check for the correct return value
|
|
|
958e1b |
Bugzilla: 1157798
|
|
|
958e1b |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
958e1b |
RH-Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
|
|
|
958e1b |
RH-Acked-by: dgibson <dgibson@redhat.com>
|
|
|
958e1b |
|
|
|
958e1b |
From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
|
|
|
958e1b |
|
|
|
958e1b |
We should check for error with s->note_size
|
|
|
958e1b |
|
|
|
958e1b |
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
|
|
|
958e1b |
Signed-off-by: Alexander Graf <agraf@suse.de>
|
|
|
958e1b |
(cherry picked from commit bb6b684363e83586c90d20127b0d0a79793ab1e2)
|
|
|
958e1b |
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
958e1b |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
958e1b |
---
|
|
|
958e1b |
dump.c | 4 ++--
|
|
|
958e1b |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
958e1b |
|
|
|
958e1b |
diff --git a/dump.c b/dump.c
|
|
|
958e1b |
index a2b6e45..8c31386 100644
|
|
|
958e1b |
--- a/dump.c
|
|
|
958e1b |
+++ b/dump.c
|
|
|
958e1b |
@@ -66,7 +66,7 @@ typedef struct DumpState {
|
|
|
958e1b |
uint32_t sh_info;
|
|
|
958e1b |
bool have_section;
|
|
|
958e1b |
bool resume;
|
|
|
958e1b |
- size_t note_size;
|
|
|
958e1b |
+ ssize_t note_size;
|
|
|
958e1b |
hwaddr memory_offset;
|
|
|
958e1b |
int fd;
|
|
|
958e1b |
|
|
|
958e1b |
@@ -771,7 +771,7 @@ static int dump_init(DumpState *s, int fd, bool paging, bool has_filter,
|
|
|
958e1b |
|
|
|
958e1b |
s->note_size = cpu_get_note_size(s->dump_info.d_class,
|
|
|
958e1b |
s->dump_info.d_machine, nr_cpus);
|
|
|
958e1b |
- if (ret < 0) {
|
|
|
958e1b |
+ if (s->note_size < 0) {
|
|
|
958e1b |
error_set(errp, QERR_UNSUPPORTED);
|
|
|
958e1b |
goto cleanup;
|
|
|
958e1b |
}
|
|
|
958e1b |
--
|
|
|
958e1b |
1.8.3.1
|
|
|
958e1b |
|