From: Xudong Hao <xudong.hao@intel.com>
To: kvm@vger.kernel.org
Cc: pbonzini@redhat.com, Xudong Hao <xudong.hao@intel.com>,
qemu-devel@nongnu.org, gleb@redhat.com
Subject: [Qemu-devel] [PATCH] qemu-kvm: fix unmatched RAM alloction/free
Date: Thu, 23 May 2013 01:02:42 -0000 [thread overview]
Message-ID: <1232233990-20383-1-git-send-email-xudong.hao@intel.com> (raw)
mmap is used in qemu_vmalloc function instead of qemu_memalign(commit
7dda5dc8), so it should change qemu_vfree to munmap to fix a unmatched
issue.
This issue appears when a PCI device is being assigned to KVM guest,
failure to read PCI rom file will bring RAM free, then the incorrect
qemu_vfree calling will cause a segment fault.
Signed-off-by: Xudong Hao <xudong.hao@intel.com>
---
exec.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/exec.c b/exec.c
index fa1e0c3..d40d237 100644
--- a/exec.c
+++ b/exec.c
@@ -1152,15 +1152,11 @@ void qemu_ram_free(ram_addr_t addr)
abort();
#endif
} else {
-#if defined(TARGET_S390X) && defined(CONFIG_KVM)
- munmap(block->host, block->length);
-#else
if (xen_enabled()) {
xen_invalidate_map_cache_entry(block->host);
} else {
- qemu_vfree(block->host);
+ munmap(block->host, block->length);
}
-#endif
}
g_free(block);
break;
--
1.5.6
next reply other threads:[~2013-05-23 1:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-23 1:02 Xudong Hao [this message]
2013-05-23 17:13 ` [Qemu-devel] [PATCH] qemu-kvm: fix unmatched RAM alloction/free Paolo Bonzini
2013-05-24 1:21 ` Hao, Xudong
2013-05-24 13:08 ` Eric Blake
2013-05-28 18:34 ` Michael Tokarev
2013-05-29 2:37 ` Hao, Xudong
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=1232233990-20383-1-git-send-email-xudong.hao@intel.com \
--to=xudong.hao@intel.com \
--cc=gleb@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).