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

login
register
mail settings
Submitter Aneesh Kumar K.V
Date Sept. 2, 2010, 4:17 p.m.
Message ID <1283444279-17241-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/63506/
State New
Headers show

Comments

Aneesh Kumar K.V - Sept. 2, 2010, 4:17 p.m.
When making copy of arguments we were doing partial copy

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
---
 vl.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Blue Swirl - Sept. 4, 2010, 10:07 a.m.
Thanks, applied.

On Thu, Sep 2, 2010 at 4:17 PM, Aneesh Kumar K.V
<aneesh.kumar@linux.vnet.ibm.com> wrote:
> When making copy of arguments we were doing partial copy
>
> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
> ---
>  vl.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/vl.c b/vl.c
> index 9f7358e..df11ab3 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -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
>
>
>

Patch

diff --git a/vl.c b/vl.c
index 9f7358e..df11ab3 100644
--- a/vl.c
+++ b/vl.c
@@ -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"));