From: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro> To: joro@8bytes.org Cc: aliguori@us.ibm.com, avi@redhat.com, qemu-devel@nongnu.org, kvm@vger.kernel.org, Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro> Subject: [RFC PATCH 1/7] acpi: qemu_realloc() might return a different pointer Date: Tue, 30 Mar 2010 11:20:02 +0300 [thread overview] Message-ID: <9b87085a250d0f70509687e4ab09336244734fad.1269936879.git.eduard.munteanu@linux360.ro> (raw) In-Reply-To: <cover.1269936879.git.eduard.munteanu@linux360.ro> We mustn't assume qemu_realloc() returns the same pointer in acpi_table_add(). Therefore, 'p' might be invalid if it's relative to the old value of acpi_tables. Signed-off-by: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro> --- hw/acpi.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/acpi.c b/hw/acpi.c index d293127..7c4e8d3 100644 --- a/hw/acpi.c +++ b/hw/acpi.c @@ -857,7 +857,7 @@ int acpi_table_add(const char *t) char buf[1024], *p, *f; struct acpi_table_header acpi_hdr; unsigned long val; - size_t off; + size_t newlen, off; memset(&acpi_hdr, 0, sizeof(acpi_hdr)); @@ -938,9 +938,10 @@ int acpi_table_add(const char *t) acpi_tables_len = sizeof(uint16_t); acpi_tables = qemu_mallocz(acpi_tables_len); } + newlen = acpi_tables_len + sizeof(uint16_t) + acpi_hdr.length; + acpi_tables = qemu_realloc(acpi_tables, newlen); p = acpi_tables + acpi_tables_len; - acpi_tables_len += sizeof(uint16_t) + acpi_hdr.length; - acpi_tables = qemu_realloc(acpi_tables, acpi_tables_len); + acpi_tables_len = newlen; acpi_hdr.length = cpu_to_le32(acpi_hdr.length); *(uint16_t*)p = acpi_hdr.length; -- 1.6.4.4
WARNING: multiple messages have this Message-ID (diff)
From: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro> To: joro@8bytes.org Cc: aliguori@us.ibm.com, Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>, avi@redhat.com, kvm@vger.kernel.org, qemu-devel@nongnu.org Subject: [Qemu-devel] [RFC PATCH 1/7] acpi: qemu_realloc() might return a different pointer Date: Tue, 30 Mar 2010 11:20:02 +0300 [thread overview] Message-ID: <9b87085a250d0f70509687e4ab09336244734fad.1269936879.git.eduard.munteanu@linux360.ro> (raw) In-Reply-To: <cover.1269936879.git.eduard.munteanu@linux360.ro> We mustn't assume qemu_realloc() returns the same pointer in acpi_table_add(). Therefore, 'p' might be invalid if it's relative to the old value of acpi_tables. Signed-off-by: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro> --- hw/acpi.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/acpi.c b/hw/acpi.c index d293127..7c4e8d3 100644 --- a/hw/acpi.c +++ b/hw/acpi.c @@ -857,7 +857,7 @@ int acpi_table_add(const char *t) char buf[1024], *p, *f; struct acpi_table_header acpi_hdr; unsigned long val; - size_t off; + size_t newlen, off; memset(&acpi_hdr, 0, sizeof(acpi_hdr)); @@ -938,9 +938,10 @@ int acpi_table_add(const char *t) acpi_tables_len = sizeof(uint16_t); acpi_tables = qemu_mallocz(acpi_tables_len); } + newlen = acpi_tables_len + sizeof(uint16_t) + acpi_hdr.length; + acpi_tables = qemu_realloc(acpi_tables, newlen); p = acpi_tables + acpi_tables_len; - acpi_tables_len += sizeof(uint16_t) + acpi_hdr.length; - acpi_tables = qemu_realloc(acpi_tables, acpi_tables_len); + acpi_tables_len = newlen; acpi_hdr.length = cpu_to_le32(acpi_hdr.length); *(uint16_t*)p = acpi_hdr.length; -- 1.6.4.4
next prev parent reply other threads:[~2010-03-30 8:20 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-03-30 8:20 [RFC PATCH 0/7] Beginning implementing the AMD IOMMU emulation Eduard - Gabriel Munteanu 2010-03-30 8:20 ` [Qemu-devel] " Eduard - Gabriel Munteanu 2010-03-30 8:20 ` Eduard - Gabriel Munteanu [this message] 2010-03-30 8:20 ` [Qemu-devel] [RFC PATCH 1/7] acpi: qemu_realloc() might return a different pointer Eduard - Gabriel Munteanu 2010-03-30 8:20 ` [RFC PATCH 2/7] acpi: split and rename acpi_table_add() Eduard - Gabriel Munteanu 2010-03-30 8:20 ` [Qemu-devel] " Eduard - Gabriel Munteanu 2010-03-30 8:20 ` [RFC PATCH 3/7] acpi: move table header definition into pc.h Eduard - Gabriel Munteanu 2010-03-30 8:20 ` [Qemu-devel] " Eduard - Gabriel Munteanu 2010-03-30 8:20 ` [RFC PATCH 4/7] sparc: rename hw/iommu.c Eduard - Gabriel Munteanu 2010-03-30 8:20 ` [Qemu-devel] " Eduard - Gabriel Munteanu 2010-03-30 17:06 ` Blue Swirl 2010-03-30 17:06 ` Blue Swirl 2010-03-30 19:28 ` Joerg Roedel 2010-03-30 19:28 ` Joerg Roedel 2010-03-30 20:00 ` Blue Swirl 2010-03-30 20:00 ` Blue Swirl 2010-03-30 20:15 ` Eduard - Gabriel Munteanu 2010-03-30 20:15 ` Eduard - Gabriel Munteanu 2010-03-31 7:27 ` Gerd Hoffmann 2010-03-31 7:27 ` Gerd Hoffmann 2010-03-30 8:20 ` [RFC PATCH 5/7] x86-64: AMD IOMMU stub Eduard - Gabriel Munteanu 2010-03-30 8:20 ` [Qemu-devel] " Eduard - Gabriel Munteanu 2010-03-30 20:37 ` Blue Swirl 2010-03-30 20:37 ` [Qemu-devel] " Blue Swirl 2010-03-30 8:20 ` [RFC PATCH 6/7] acpi: cleanup acpi_checksum() Eduard - Gabriel Munteanu 2010-03-30 8:20 ` [Qemu-devel] " Eduard - Gabriel Munteanu 2010-03-30 8:20 ` [RFC PATCH 7/7] acpi: fix bug in acpi_checksum() caused by garbage in checksum field Eduard - Gabriel Munteanu 2010-03-30 8:20 ` [Qemu-devel] " Eduard - Gabriel Munteanu 2010-03-30 15:10 ` Richard Henderson 2010-03-30 15:10 ` Richard Henderson 2010-03-30 19:40 ` [RFC PATCH 0/7] Beginning implementing the AMD IOMMU emulation Joerg Roedel 2010-03-30 19:40 ` [Qemu-devel] " Joerg Roedel 2010-03-31 5:38 ` Avi Kivity 2010-03-31 5:38 ` [Qemu-devel] " Avi Kivity
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=9b87085a250d0f70509687e4ab09336244734fad.1269936879.git.eduard.munteanu@linux360.ro \ --to=eduard.munteanu@linux360.ro \ --cc=aliguori@us.ibm.com \ --cc=avi@redhat.com \ --cc=joro@8bytes.org \ --cc=kvm@vger.kernel.org \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.