If guest name is used (which is default case) the kvm might end
up carrying the pointer to name which is allocated on stack.

kvm_cmd_run_init
  (on stack) default_name
  kvm__init(..., default_name)
    kvm->name = default_name

So I think better to allow kvm to carry own copy
of guest name. 64 symbols should be more than enough.

Signed-off-by: Cyrill Gorcunov <[email protected]>
---

I hope I didn't miss anything?

 tools/kvm/kvm.c                          |    2 +-
 tools/kvm/powerpc/include/kvm/kvm-arch.h |    2 +-
 tools/kvm/x86/include/kvm/kvm-arch.h     |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Index: linux-2.6.git/tools/kvm/kvm.c
===================================================================
--- linux-2.6.git.orig/tools/kvm/kvm.c
+++ linux-2.6.git/tools/kvm/kvm.c
@@ -384,7 +384,7 @@ struct kvm *kvm__init(const char *kvm_de
 
        kvm__arch_init(kvm, hugetlbfs_path, ram_size);
 
-       kvm->name = name;
+       strncpy(kvm->name, name, sizeof(kvm->name));
 
        kvm_ipc__start(kvm__create_socket(kvm));
        kvm_ipc__register_handler(KVM_IPC_PID, kvm__pid);
Index: linux-2.6.git/tools/kvm/powerpc/include/kvm/kvm-arch.h
===================================================================
--- linux-2.6.git.orig/tools/kvm/powerpc/include/kvm/kvm-arch.h
+++ linux-2.6.git/tools/kvm/powerpc/include/kvm/kvm-arch.h
@@ -64,7 +64,7 @@ struct kvm {
        unsigned long           fdt_gra;
        unsigned long           initrd_gra;
        unsigned long           initrd_size;
-       const char              *name;
+       char                    name[64];
        int                     vm_state;
 };
 
Index: linux-2.6.git/tools/kvm/x86/include/kvm/kvm-arch.h
===================================================================
--- linux-2.6.git.orig/tools/kvm/x86/include/kvm/kvm-arch.h
+++ linux-2.6.git/tools/kvm/x86/include/kvm/kvm-arch.h
@@ -48,7 +48,7 @@ struct kvm {
        struct disk_image       **disks;
        int                     nr_disks;
 
-       const char              *name;
+       char                    name[64];
 
        int                     vm_state;
 };
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to