[Qemu-devel] [PULL 1.0 0/1] 'info mtree' fix

[Qemu-devel] [PULL 1.0 0/1] 'info mtree' fix

[Avi Kivity]

Fix a segfault due to incorrect usage of QTAILQ_FOREACH_SAFE().

Avi Kivity (1):
  memory: fix 'info mtree' segfaults

 memory.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

-- 
1.7.7.1

[Qemu-devel] [PATCH 1.0 1/1] memory: fix 'info mtree' segfaults

[Avi Kivity]

'info mtree' accesses invalid memory in two cases, both due to incorrect
(and unsafe) usage of QTAILQ_FOREACH_SAFE().

Reported-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Avi Kivity <avi@redhat.com>
---
 memory.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/memory.c b/memory.c
index c0c1d12..7c20a07 100644
--- a/memory.c
+++ b/memory.c
@@ -1401,7 +1401,7 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f,
                        alias_print_queue);
     }
 
-    QTAILQ_FOREACH_SAFE(next_ml, &submr_print_queue, queue, ml) {
+    QTAILQ_FOREACH_SAFE(ml, &submr_print_queue, queue, next_ml) {
         g_free(ml);
     }
 }
@@ -1425,7 +1425,7 @@ void mtree_info(fprintf_function mon_printf, void *f)
     }
 
     QTAILQ_FOREACH_SAFE(ml, &ml_head, queue, ml2) {
-        g_free(ml2);
+        g_free(ml);
     }
 
     if (address_space_io.root &&
-- 
1.7.7.1

Re: [Qemu-devel] [PULL 1.0 0/1] 'info mtree' fix

[Avi Kivity]

On 11/13/2011 12:06 PM, Avi Kivity wrote:
> Fix a segfault due to incorrect usage of QTAILQ_FOREACH_SAFE().
>
> Avi Kivity (1):
>   memory: fix 'info mtree' segfaults
>
>  memory.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>

Gaaah.  If it isn't generated by git request-pull, it's broken.

Please pull from:

  git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git memory/urgent

to receive the fix above.

-- 
error compiling committee.c: too many arguments to function

Re: [Qemu-devel] [PULL 1.0 0/1] 'info mtree' fix

[Anthony Liguori]

On 11/13/2011 04:08 AM, Avi Kivity wrote:
> On 11/13/2011 12:06 PM, Avi Kivity wrote:
>> Fix a segfault due to incorrect usage of QTAILQ_FOREACH_SAFE().
>>
>> Avi Kivity (1):
>>    memory: fix 'info mtree' segfaults
>>
>>   memory.c |    4 ++--
>>   1 files changed, 2 insertions(+), 2 deletions(-)
>>
>
> Gaaah.  If it isn't generated by git request-pull, it's broken.
>
> Please pull from:
>
>    git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git memory/urgent
>
> to receive the fix above.

Pulled.  Thanks.

Regards,

Anthony Liguori

>