mirror of
https://github.com/clearlinux/kvmtool.git
synced 2026-06-16 02:15:47 +00:00
kvm tool: Make kvm structure to carry name copy
If default guest name is used (which is the default
case) the kvm might end up carrying the pointer to
a name which is allocated on stack.
kvm_cmd_run_init
(on stack) default_name
kvm__init(..., default_name)
kvm->name = default_name
So make it to carry a copy of name.
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
This commit is contained in:
committed by
Will Deacon
parent
5e8d833b98
commit
dfb2e45886
@@ -254,6 +254,7 @@ int kvm__exit(struct kvm *kvm)
|
||||
kvm__arch_delete_ram(kvm);
|
||||
kvm_ipc__stop();
|
||||
kvm__remove_socket(kvm->name);
|
||||
free(kvm->name);
|
||||
free(kvm);
|
||||
|
||||
return 0;
|
||||
@@ -377,6 +378,12 @@ struct kvm *kvm__init(const char *kvm_dev, const char *hugetlbfs_path, u64 ram_s
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
kvm->name = strdup(name);
|
||||
if (!kvm->name) {
|
||||
ret = -ENOMEM;
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
if (kvm__check_extensions(kvm)) {
|
||||
pr_err("A required KVM extention is not supported by OS");
|
||||
ret = -ENOSYS;
|
||||
@@ -384,8 +391,6 @@ struct kvm *kvm__init(const char *kvm_dev, const char *hugetlbfs_path, u64 ram_s
|
||||
|
||||
kvm__arch_init(kvm, hugetlbfs_path, ram_size);
|
||||
|
||||
kvm->name = name;
|
||||
|
||||
kvm_ipc__start(kvm__create_socket(kvm));
|
||||
kvm_ipc__register_handler(KVM_IPC_PID, kvm__pid);
|
||||
return kvm;
|
||||
|
||||
@@ -69,7 +69,7 @@ struct kvm {
|
||||
unsigned long fdt_gra;
|
||||
unsigned long initrd_gra;
|
||||
unsigned long initrd_size;
|
||||
const char *name;
|
||||
char *name;
|
||||
int vm_state;
|
||||
struct icp_state *icp;
|
||||
struct spapr_phb *phb;
|
||||
|
||||
@@ -48,7 +48,7 @@ struct kvm {
|
||||
struct disk_image **disks;
|
||||
int nr_disks;
|
||||
|
||||
const char *name;
|
||||
char *name;
|
||||
|
||||
int vm_state;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user