[Qemu-devel] [PATCH 1/2] net: make iov_to_buf take right size argument in nc_sendv_compat()

[Qemu-devel] [PATCH 1/2] net: make iov_to_buf take right size argument in nc_sendv_compat()

[Yang Hongyang]

We want "buf, sizeof(buf)" here.  sizeof(buffer) is the size of a
pointer, which is wrong.
Thanks to Paolo for pointing it out.

Signed-off-by: Yang Hongyang <yanghy@cn.fujitsu.com>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
---
 net/net.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/net.c b/net/net.c
index 39af893..0c4a012 100644
--- a/net/net.c
+++ b/net/net.c
@@ -700,7 +700,7 @@ static ssize_t nc_sendv_compat(NetClientState *nc, const struct iovec *iov,
         offset = iov[0].iov_len;
     } else {
         buffer = buf;
-        offset = iov_to_buf(iov, iovcnt, 0, buffer, sizeof(buffer));
+        offset = iov_to_buf(iov, iovcnt, 0, buf, sizeof(buf));
     }
 
     if (flags & QEMU_NET_PACKET_FLAG_RAW && nc->info->receive_raw) {
-- 
1.9.1

[Qemu-devel] [PATCH 2/2] net: free the string returned by object_get_canonical_path_component

[Yang Hongyang]

The value returned from object_get_canonical_path_component
must be freed.

Signed-off-by: Yang Hongyang <yanghy@cn.fujitsu.com>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
---
 net/net.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/net/net.c b/net/net.c
index 0c4a012..459bf19 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1189,10 +1189,11 @@ void print_net_client(Monitor *mon, NetClientState *nc)
         monitor_printf(mon, "filters:\n");
     }
     QTAILQ_FOREACH(nf, &nc->filters, next) {
-        monitor_printf(mon, "  - %s: type=%s%s\n",
-                       object_get_canonical_path_component(OBJECT(nf)),
+        char *path = object_get_canonical_path_component(OBJECT(nf));
+        monitor_printf(mon, "  - %s: type=%s%s\n", path,
                        object_get_typename(OBJECT(nf)),
                        nf->info_str);
+        g_free(path);
     }
 }
 
-- 
1.9.1

Re: [Qemu-devel] [PATCH 1/2] net: make iov_to_buf take right size argument in nc_sendv_compat()

[Jason Wang]

On 10/20/2015 09:51 AM, Yang Hongyang wrote:
> We want "buf, sizeof(buf)" here.  sizeof(buffer) is the size of a
> pointer, which is wrong.
> Thanks to Paolo for pointing it out.
>
> Signed-off-by: Yang Hongyang <yanghy@cn.fujitsu.com>
> Cc: Jason Wang <jasowang@redhat.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  net/net.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/net.c b/net/net.c
> index 39af893..0c4a012 100644
> --- a/net/net.c
> +++ b/net/net.c
> @@ -700,7 +700,7 @@ static ssize_t nc_sendv_compat(NetClientState *nc, const struct iovec *iov,
>          offset = iov[0].iov_len;
>      } else {
>          buffer = buf;
> -        offset = iov_to_buf(iov, iovcnt, 0, buffer, sizeof(buffer));
> +        offset = iov_to_buf(iov, iovcnt, 0, buf, sizeof(buf));
>      }
>  
>      if (flags & QEMU_NET_PACKET_FLAG_RAW && nc->info->receive_raw) {

Both two patches were applied in:

https://github.com/jasowang/qemu/commits/net

Thanks

Re: [Qemu-devel] [PATCH 1/2] net: make iov_to_buf take right size argument in nc_sendv_compat()

[Paolo Bonzini]

On 20/10/2015 09:20, Jason Wang wrote:
> 
> 
> On 10/20/2015 09:51 AM, Yang Hongyang wrote:
>> We want "buf, sizeof(buf)" here.  sizeof(buffer) is the size of a
>> pointer, which is wrong.
>> Thanks to Paolo for pointing it out.
>>
>> Signed-off-by: Yang Hongyang <yanghy@cn.fujitsu.com>
>> Cc: Jason Wang <jasowang@redhat.com>
>> Cc: Paolo Bonzini <pbonzini@redhat.com>
>> ---
>>  net/net.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/net/net.c b/net/net.c
>> index 39af893..0c4a012 100644
>> --- a/net/net.c
>> +++ b/net/net.c
>> @@ -700,7 +700,7 @@ static ssize_t nc_sendv_compat(NetClientState *nc, const struct iovec *iov,
>>          offset = iov[0].iov_len;
>>      } else {
>>          buffer = buf;
>> -        offset = iov_to_buf(iov, iovcnt, 0, buffer, sizeof(buffer));
>> +        offset = iov_to_buf(iov, iovcnt, 0, buf, sizeof(buf));
>>      }
>>  
>>      if (flags & QEMU_NET_PACKET_FLAG_RAW && nc->info->receive_raw) {
> 
> Both two patches were applied in:
> 
> https://github.com/jasowang/qemu/commits/net
> 
> Thanks

Thanks!

Paolo