Skip to contentSkip to conversation

virtio-9p: Make sure -virtfs option works correctly

PATCH Applied Aneesh Kumar K.V 2 participants 2 messages Sep 2, 2010 – Sep 4, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 virtio-9p: Make sure -virtfs option works correctly

When making copy of arguments we were doing partial copy

---
 vl.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
vl.c +2 -2
index 9f7358e..df11ab3 100644
@@ -2332,7 +2332,7 @@ int main(int argc, char **argv, char **envp)
                 len += strlen(qemu_opt_get(opts, "security_model"));
                 arg_fsdev = qemu_malloc((len + 1) * sizeof(*arg_fsdev));
 
-                snprintf(arg_fsdev, len * sizeof(*arg_fsdev),
+                snprintf(arg_fsdev, (len + 1) * sizeof(*arg_fsdev),
                          "%s,id=%s,path=%s,security_model=%s",
                          qemu_opt_get(opts, "fstype"),
                          qemu_opt_get(opts, "mount_tag"),
@@ -2343,7 +2343,7 @@ int main(int argc, char **argv, char **envp)
                 len += 2*strlen(qemu_opt_get(opts, "mount_tag"));
                 arg_9p = qemu_malloc((len + 1) * sizeof(*arg_9p));
 
-                snprintf(arg_9p, len * sizeof(*arg_9p),
+                snprintf(arg_9p, (len + 1) * sizeof(*arg_9p),
                          "virtio-9p-pci,fsdev=%s,mount_tag=%s",
                          qemu_opt_get(opts, "mount_tag"),
                          qemu_opt_get(opts, "mount_tag"));
Signature · 1 line
1.7.0.4
Applied
#1 lore raw

Thanks, applied.

Quoted 34 lines · Aneesh Kumar K.V

When making copy of arguments we were doing partial copy

---
 vl.c |    4 ++--

 1 files changed, 2 insertions(+), 2 deletions(-)
vl.c +2 -3
index 9f7358e..df11ab3 100644
@@ -2332,7 +2332,7 @@ int main(int argc, char **argv, char **envp)
                 len += strlen(qemu_opt_get(opts, "security_model"));
                 arg_fsdev = qemu_malloc((len + 1) * sizeof(*arg_fsdev));
 
-                snprintf(arg_fsdev, len * sizeof(*arg_fsdev),
+                snprintf(arg_fsdev, (len + 1) * sizeof(*arg_fsdev),
                          "%s,id=%s,path=%s,security_model=%s",
                          qemu_opt_get(opts, "fstype"),
                          qemu_opt_get(opts, "mount_tag"),
@@ -2343,7 +2343,7 @@ int main(int argc, char **argv, char **envp)
                 len += 2*strlen(qemu_opt_get(opts, "mount_tag"));
                 arg_9p = qemu_malloc((len + 1) * sizeof(*arg_9p));
 
-                snprintf(arg_9p, len * sizeof(*arg_9p),
+                snprintf(arg_9p, (len + 1) * sizeof(*arg_9p),
                          "virtio-9p-pci,fsdev=%s,mount_tag=%s",
                          qemu_opt_get(opts, "mount_tag"),
                          qemu_opt_get(opts, "mount_tag"));
--

1.7.0.4