* [Qemu-devel] [PATCH] memory: fix segv on qemu_ram_free(block=0x0)
@ 2016-03-29 11:20 marcandre.lureau
2016-03-29 11:27 ` Paolo Bonzini
0 siblings, 1 reply; 2+ messages in thread
From: marcandre.lureau @ 2016-03-29 11:20 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, arei.gonglei, famz, Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Since f1060c55bf1377b4, the pointer is directly passed to
qemu_ram_free(). However, on initialization failure, it may be called
with a NULL pointer. Return immediately in this case.
This fixes a SEGV when memory initialization failed, for example
permission denied on open backing store /dev/hugepages, with -object
memory-backend-file,mem-path=/dev/hugepages.
Program received signal SIGSEGV, Segmentation fault.
0x00005555556e67e7 in qemu_ram_free (block=0x0) at /home/elmarco/src/qemu/exec.c:1775
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
exec.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/exec.c b/exec.c
index f398d21..965f3b2 100644
--- a/exec.c
+++ b/exec.c
@@ -1771,6 +1771,10 @@ static void reclaim_ramblock(RAMBlock *block)
void qemu_ram_free(RAMBlock *block)
{
+ if (!block) {
+ return;
+ }
+
qemu_mutex_lock_ramlist();
QLIST_REMOVE_RCU(block, next);
ram_list.mru_block = NULL;
--
2.5.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH] memory: fix segv on qemu_ram_free(block=0x0)
2016-03-29 11:20 [Qemu-devel] [PATCH] memory: fix segv on qemu_ram_free(block=0x0) marcandre.lureau
@ 2016-03-29 11:27 ` Paolo Bonzini
0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2016-03-29 11:27 UTC (permalink / raw)
To: marcandre.lureau, qemu-devel; +Cc: arei.gonglei, famz
On 29/03/2016 13:20, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Since f1060c55bf1377b4, the pointer is directly passed to
> qemu_ram_free(). However, on initialization failure, it may be called
> with a NULL pointer. Return immediately in this case.
>
> This fixes a SEGV when memory initialization failed, for example
> permission denied on open backing store /dev/hugepages, with -object
> memory-backend-file,mem-path=/dev/hugepages.
>
> Program received signal SIGSEGV, Segmentation fault.
> 0x00005555556e67e7 in qemu_ram_free (block=0x0) at /home/elmarco/src/qemu/exec.c:1775
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Looks good, thanks! I'll push it during hard freeze.
Paolo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-03-29 11:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-29 11:20 [Qemu-devel] [PATCH] memory: fix segv on qemu_ram_free(block=0x0) marcandre.lureau
2016-03-29 11:27 ` Paolo Bonzini
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).