[PATCH v5 0/3] qemu-ga: Summarize and merge commits

[PATCH v5 0/3] qemu-ga: Summarize and merge commits

[Dehan Meng]

v4:
Handle g_autoptr() to simplify code and memory leak

v3:
Modify commits message and do some minor update.

v2:
Split v1 up to separate commits for each logically independent change

Dehan Meng (3):
  qemu-ga: Add 'Null' check and Redefine 'route'
  qemu-ga: Optimize var declaration and definition
  qemu-ga: Avoiding freeing line prematurely

Signed-off-by: Dehan Meng <demeng@redhat.com>

 qga/commands-linux.c | 134 +++++++++++++++++++++----------------------
 1 file changed, 65 insertions(+), 69 deletions(-)

-- 
2.40.1

[PATCH v5 1/3] qemu-ga: Add 'Null' check and Redefine 'route'

[Dehan Meng]

sscanf return values are checked and add 'Null' check for
mandatory parameters. And merged redundant route and
networkroute variables.

Signed-off-by: Dehan Meng <demeng@redhat.com>
---
 qga/commands-linux.c | 86 +++++++++++++++++++++++---------------------
 1 file changed, 45 insertions(+), 41 deletions(-)

diff --git a/qga/commands-linux.c b/qga/commands-linux.c
index 51d5e3d927..495de74b31 100644
--- a/qga/commands-linux.c
+++ b/qga/commands-linux.c
@@ -2103,7 +2103,9 @@ static char *hexToIPAddress(const void *hexValue, int is_ipv6)
         int i;
 
         for (i = 0; i < 16; i++) {
-            sscanf(&hexStr[i * 2], "%02hhx", &in6.s6_addr[i]);
+            if (sscanf(&hex_str[i * 2], "%02hhx", &in6.s6_addr[i]) != 1) {
+                return NULL;
+            }
         }
         inet_ntop(AF_INET6, &in6, addr, INET6_ADDRSTRLEN);
 
@@ -2160,26 +2162,25 @@ GuestNetworkRouteList *qmp_guest_network_get_route(Error **errp)
                     continue;
                 }
 
-                route = g_new0(GuestNetworkRoute, 1);
-                networkroute = route;
-                networkroute->iface = g_strdup(Iface);
-                networkroute->destination = hexToIPAddress(Destination, 1);
-                networkroute->metric = Metric;
-                networkroute->source = hexToIPAddress(Source, 1);
-                networkroute->desprefixlen = g_strdup_printf(
-                    "%d", DesPrefixlen
-                );
-                networkroute->srcprefixlen = g_strdup_printf(
-                    "%d", SrcPrefixlen
-                );
-                networkroute->nexthop = hexToIPAddress(NextHop, 1);
-                networkroute->has_flags = true;
-                networkroute->flags = Flags;
-                networkroute->has_refcnt = true;
-                networkroute->refcnt = RefCnt;
-                networkroute->has_use = true;
-                networkroute->use = Use;
-                networkroute->version = 6;
+                g_autoptr(GuestNetworkRoute) route = g_new0(GuestNetworkRoute, 1);
+
+                route->destination = hex_to_ip_address(destination, 1);
+                route->iface = g_strdup(iface);
+                if (route->destination == NULL) {
+                    continue;
+                }
+                route->source = hex_to_ip_address(source, 1);
+                route->nexthop = hex_to_ip_address(next_hop, 1);
+                route->desprefixlen = g_strdup_printf("%d", des_prefixlen);
+                route->srcprefixlen = g_strdup_printf("%d", src_prefixlen);
+                route->metric = metric;
+                route->has_flags = true;
+                route->flags = flags;
+                route->has_refcnt = true;
+                route->refcnt = refcnt;
+                route->has_use = true;
+                route->use = use;
+                route->version = 6;
             } else {
                 unsigned int Destination, Gateway, Mask, Flags;
                 int RefCnt, Use, Metric, MTU, Window, IRTT;
@@ -2191,26 +2192,29 @@ GuestNetworkRouteList *qmp_guest_network_get_route(Error **errp)
                     continue;
                 }
 
-                route = g_new0(GuestNetworkRoute, 1);
-                networkroute = route;
-                networkroute->iface = g_strdup(Iface);
-                networkroute->destination = hexToIPAddress(&Destination, 0);
-                networkroute->gateway = hexToIPAddress(&Gateway, 0);
-                networkroute->mask = hexToIPAddress(&Mask, 0);
-                networkroute->metric = Metric;
-                networkroute->has_flags = true;
-                networkroute->flags = Flags;
-                networkroute->has_refcnt = true;
-                networkroute->refcnt = RefCnt;
-                networkroute->has_use = true;
-                networkroute->use = Use;
-                networkroute->has_mtu = true;
-                networkroute->mtu = MTU;
-                networkroute->has_window = true;
-                networkroute->window = Window;
-                networkroute->has_irtt = true;
-                networkroute->irtt = IRTT;
-                networkroute->version = 4;
+                g_autoptr(GuestNetworkRoute) route = g_new0(GuestNetworkRoute, 1);
+
+                route->destination = hex_to_ip_address(destination, 1);
+                route->iface = g_strdup(iface);
+                if (route->destination == NULL) {
+                    continue;
+                }
+                route->gateway = hex_to_ip_address(&gateway, 0);
+                route->mask = hex_to_ip_address(&mask, 0);
+                route->metric = metric;
+                route->has_flags = true;
+                route->flags = flags;
+                route->has_refcnt = true;
+                route->refcnt = refcnt;
+                route->has_use = true;
+                route->use = use;
+                route->has_mtu = true;
+                route->mtu = mtu;
+                route->has_window = true;
+                route->window = window;
+                route->has_irtt = true;
+                route->irtt = irtt;
+                route->version = 4;
             }
 
             QAPI_LIST_APPEND(tail, route);
-- 
2.40.1

Re: [PATCH v5 1/3] qemu-ga: Add 'Null' check and Redefine 'route'

[Daniel P. Berrangé]

On Wed, Nov 06, 2024 at 04:41:32PM +0800, Dehan Meng wrote:
> sscanf return values are checked and add 'Null' check for
> mandatory parameters. And merged redundant route and
> networkroute variables.
> 
> Signed-off-by: Dehan Meng <demeng@redhat.com>
> ---
>  qga/commands-linux.c | 86 +++++++++++++++++++++++---------------------
>  1 file changed, 45 insertions(+), 41 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [PATCH v5 1/3] qemu-ga: Add 'Null' check and Redefine 'route'

[Konstantin Kostiuk]

[-- Attachment #1: Type: text/plain, Size: 898 bytes --]

Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>

On Wed, Nov 6, 2024 at 3:35 PM Daniel P. Berrangé <berrange@redhat.com>
wrote:

> On Wed, Nov 06, 2024 at 04:41:32PM +0800, Dehan Meng wrote:
> > sscanf return values are checked and add 'Null' check for
> > mandatory parameters. And merged redundant route and
> > networkroute variables.
> >
> > Signed-off-by: Dehan Meng <demeng@redhat.com>
> > ---
> >  qga/commands-linux.c | 86 +++++++++++++++++++++++---------------------
> >  1 file changed, 45 insertions(+), 41 deletions(-)
>
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
>
>
> With regards,
> Daniel
> --
> |: https://berrange.com      -o-
> https://www.flickr.com/photos/dberrange :|
> |: https://libvirt.org         -o-
> https://fstop138.berrange.com :|
> |: https://entangle-photo.org    -o-
> https://www.instagram.com/dberrange :|
>
>

[-- Attachment #2: Type: text/html, Size: 1920 bytes --]

Re: [PATCH v5 1/3] qemu-ga: Add 'Null' check and Redefine 'route'

[Konstantin Kostiuk]

[-- Attachment #1: Type: text/plain, Size: 6775 bytes --]

Best Regards,
Konstantin Kostiuk.


On Wed, Nov 6, 2024 at 10:41 AM Dehan Meng <demeng@redhat.com> wrote:

> sscanf return values are checked and add 'Null' check for
> mandatory parameters. And merged redundant route and
> networkroute variables.
>
> Signed-off-by: Dehan Meng <demeng@redhat.com>
> ---
>  qga/commands-linux.c | 86 +++++++++++++++++++++++---------------------
>  1 file changed, 45 insertions(+), 41 deletions(-)
>
> diff --git a/qga/commands-linux.c b/qga/commands-linux.c
> index 51d5e3d927..495de74b31 100644
> --- a/qga/commands-linux.c
> +++ b/qga/commands-linux.c
> @@ -2103,7 +2103,9 @@ static char *hexToIPAddress(const void *hexValue,
> int is_ipv6)
>          int i;
>
>          for (i = 0; i < 16; i++) {
> -            sscanf(&hexStr[i * 2], "%02hhx", &in6.s6_addr[i]);
> +            if (sscanf(&hex_str[i * 2], "%02hhx", &in6.s6_addr[i]) != 1) {
> +                return NULL;
> +            }
>          }
>          inet_ntop(AF_INET6, &in6, addr, INET6_ADDRSTRLEN);
>
> @@ -2160,26 +2162,25 @@ GuestNetworkRouteList
> *qmp_guest_network_get_route(Error **errp)
>                      continue;
>                  }
>
> -                route = g_new0(GuestNetworkRoute, 1);
> -                networkroute = route;
> -                networkroute->iface = g_strdup(Iface);
> -                networkroute->destination = hexToIPAddress(Destination,
> 1);
> -                networkroute->metric = Metric;
> -                networkroute->source = hexToIPAddress(Source, 1);
> -                networkroute->desprefixlen = g_strdup_printf(
> -                    "%d", DesPrefixlen
> -                );
> -                networkroute->srcprefixlen = g_strdup_printf(
> -                    "%d", SrcPrefixlen
> -                );
> -                networkroute->nexthop = hexToIPAddress(NextHop, 1);
> -                networkroute->has_flags = true;
> -                networkroute->flags = Flags;
> -                networkroute->has_refcnt = true;
> -                networkroute->refcnt = RefCnt;
> -                networkroute->has_use = true;
> -                networkroute->use = Use;
> -                networkroute->version = 6;
> +                g_autoptr(GuestNetworkRoute) route =
> g_new0(GuestNetworkRoute, 1);
> +
> +                route->destination = hex_to_ip_address(destination, 1);
>

Compilation failed

../qga/commands-linux.c: In function ‘qmp_guest_network_get_route’:
../qga/commands-linux.c:2189:56: error: passing argument 1 of
‘hex_to_ip_address’ makes pointer from integer without a cast
[-Wint-conversion]
 2189 |                 route->destination = hex_to_ip_address(destination,
1);
      |                                                        ^~~~~~~~~~~
      |                                                        |
      |                                                        unsigned int
../qga/commands-linux.c:2096:44: note: expected ‘const void *’ but argument
is of type ‘unsigned int’
 2096 | static char *hex_to_ip_address(const void *hex_value, int is_ipv6)
      |                                ~~~~~~~~~~~~^~~~~~~~~

You use `destination` but the variable declaration was not updated from
`Destination`.
The same for DesPrefixlen/des_prefixlen, Flags/flags, etc.

Looks like you mixed changes from the next commit into this one.

+                route->iface = g_strdup(iface);
> +                if (route->destination == NULL) {
> +                    continue;
> +                }
> +                route->source = hex_to_ip_address(source, 1);
> +                route->nexthop = hex_to_ip_address(next_hop, 1);
> +                route->desprefixlen = g_strdup_printf("%d",
> des_prefixlen);
> +                route->srcprefixlen = g_strdup_printf("%d",
> src_prefixlen);
> +                route->metric = metric;
> +                route->has_flags = true;
> +                route->flags = flags;
> +                route->has_refcnt = true;
> +                route->refcnt = refcnt;
> +                route->has_use = true;
> +                route->use = use;
> +                route->version = 6;
>              } else {
>                  unsigned int Destination, Gateway, Mask, Flags;
>                  int RefCnt, Use, Metric, MTU, Window, IRTT;
> @@ -2191,26 +2192,29 @@ GuestNetworkRouteList
> *qmp_guest_network_get_route(Error **errp)
>                      continue;
>                  }
>
> -                route = g_new0(GuestNetworkRoute, 1);
> -                networkroute = route;
> -                networkroute->iface = g_strdup(Iface);
> -                networkroute->destination = hexToIPAddress(&Destination,
> 0);
> -                networkroute->gateway = hexToIPAddress(&Gateway, 0);
> -                networkroute->mask = hexToIPAddress(&Mask, 0);
> -                networkroute->metric = Metric;
> -                networkroute->has_flags = true;
> -                networkroute->flags = Flags;
> -                networkroute->has_refcnt = true;
> -                networkroute->refcnt = RefCnt;
> -                networkroute->has_use = true;
> -                networkroute->use = Use;
> -                networkroute->has_mtu = true;
> -                networkroute->mtu = MTU;
> -                networkroute->has_window = true;
> -                networkroute->window = Window;
> -                networkroute->has_irtt = true;
> -                networkroute->irtt = IRTT;
> -                networkroute->version = 4;
> +                g_autoptr(GuestNetworkRoute) route =
> g_new0(GuestNetworkRoute, 1);
> +
> +                route->destination = hex_to_ip_address(destination, 1);
> +                route->iface = g_strdup(iface);
> +                if (route->destination == NULL) {
> +                    continue;
> +                }
> +                route->gateway = hex_to_ip_address(&gateway, 0);
> +                route->mask = hex_to_ip_address(&mask, 0);
> +                route->metric = metric;
> +                route->has_flags = true;
> +                route->flags = flags;
> +                route->has_refcnt = true;
> +                route->refcnt = refcnt;
> +                route->has_use = true;
> +                route->use = use;
> +                route->has_mtu = true;
> +                route->mtu = mtu;
> +                route->has_window = true;
> +                route->window = window;
> +                route->has_irtt = true;
> +                route->irtt = irtt;
> +                route->version = 4;
>              }
>
>              QAPI_LIST_APPEND(tail, route);
> --
> 2.40.1
>
>

[-- Attachment #2: Type: text/html, Size: 8944 bytes --]

[PATCH v5 2/3] qemu-ga: Optimize var declaration and definition

[Dehan Meng]

Variable declarations moved to the beginning of blocks
Followed the coding style of using snake_case for variable names.
Proper initialization of param 'size_t n' to '0' for

Signed-off-by: Dehan Meng <demeng@redhat.com>
---
 qga/commands-linux.c | 43 +++++++++++++++++++------------------------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/qga/commands-linux.c b/qga/commands-linux.c
index 495de74b31..55c35bfc8f 100644
--- a/qga/commands-linux.c
+++ b/qga/commands-linux.c
@@ -2094,12 +2094,12 @@ GuestCpuStatsList *qmp_guest_get_cpustats(Error **errp)
     return head;
 }
 
-static char *hexToIPAddress(const void *hexValue, int is_ipv6)
+static char *hex_to_ip_address(const void *hex_value, int is_ipv6)
 {
     if (is_ipv6) {
         char addr[INET6_ADDRSTRLEN];
         struct in6_addr in6;
-        const char *hexStr = (const char *)hexValue;
+        const char *hex_str = (const char *)hex_value;
         int i;
 
         for (i = 0; i < 16; i++) {
@@ -2111,11 +2111,11 @@ static char *hexToIPAddress(const void *hexValue, int is_ipv6)
 
         return g_strdup(addr);
     } else {
-        unsigned int hexInt = *(unsigned int *)hexValue;
-        unsigned int byte1 = (hexInt >> 24) & 0xFF;
-        unsigned int byte2 = (hexInt >> 16) & 0xFF;
-        unsigned int byte3 = (hexInt >> 8) & 0xFF;
-        unsigned int byte4 = hexInt & 0xFF;
+        unsigned int hex_int = *(unsigned int *)hex_value;
+        unsigned int byte1 = (hex_int >> 24) & 0xFF;
+        unsigned int byte2 = (hex_int >> 16) & 0xFF;
+        unsigned int byte3 = (hex_int >> 8) & 0xFF;
+        unsigned int byte4 = hex_int & 0xFF;
 
         return g_strdup_printf("%u.%u.%u.%u", byte4, byte3, byte2, byte1);
     }
@@ -2126,11 +2126,12 @@ GuestNetworkRouteList *qmp_guest_network_get_route(Error **errp)
     GuestNetworkRouteList *head = NULL, **tail = &head;
     const char *routeFiles[] = {"/proc/net/route", "/proc/net/ipv6_route"};
     FILE *fp;
-    size_t n;
+    size_t n = 0;
     char *line = NULL;
     int firstLine;
     int is_ipv6;
     int i;
+    char iface[IFNAMSIZ];
 
     for (i = 0; i < 2; i++) {
         firstLine = 1;
@@ -2147,18 +2148,14 @@ GuestNetworkRouteList *qmp_guest_network_get_route(Error **errp)
                 firstLine = 0;
                 continue;
             }
-            GuestNetworkRoute *route = NULL;
-            GuestNetworkRoute *networkroute;
-            char Iface[IFNAMSIZ];
+            
             if (is_ipv6) {
-                char Destination[33], Source[33], NextHop[33];
-                int DesPrefixlen, SrcPrefixlen, Metric, RefCnt, Use, Flags;
-
-                /* Parse the line and extract the values */
+                char destination[33], source[33], next_hop[33];
+                int des_prefixlen, src_prefixlen, metric, refcnt, use, flags;
                 if (sscanf(line, "%32s %x %32s %x %32s %x %x %x %x %s",
-                           Destination, &DesPrefixlen, Source,
-                           &SrcPrefixlen, NextHop, &Metric, &RefCnt,
-                           &Use, &Flags, Iface) != 10) {
+                           destination, &des_prefixlen, source,
+                           &src_prefixlen, next_hop, &metric, &refcnt,
+                           &use, &flags, iface) != 10) {
                     continue;
                 }
 
@@ -2182,13 +2179,11 @@ GuestNetworkRouteList *qmp_guest_network_get_route(Error **errp)
                 route->use = use;
                 route->version = 6;
             } else {
-                unsigned int Destination, Gateway, Mask, Flags;
-                int RefCnt, Use, Metric, MTU, Window, IRTT;
-
-                /* Parse the line and extract the values */
+                unsigned int destination, gateway, mask, flags;
+                int refcnt, use, metric, mtu, window, irtt;
                 if (sscanf(line, "%s %X %X %x %d %d %d %X %d %d %d",
-                           Iface, &Destination, &Gateway, &Flags, &RefCnt,
-                           &Use, &Metric, &Mask, &MTU, &Window, &IRTT) != 11) {
+                           iface, &destination, &gateway, &flags, &refcnt,
+                           &use, &metric, &mask, &mtu, &window, &irtt) != 11) {
                     continue;
                 }
 
-- 
2.40.1

Re: [PATCH v5 2/3] qemu-ga: Optimize var declaration and definition

[Daniel P. Berrangé]

On Wed, Nov 06, 2024 at 04:41:33PM +0800, Dehan Meng wrote:
> Variable declarations moved to the beginning of blocks
> Followed the coding style of using snake_case for variable names.
> Proper initialization of param 'size_t n' to '0' for
> 
> Signed-off-by: Dehan Meng <demeng@redhat.com>
> ---
>  qga/commands-linux.c | 43 +++++++++++++++++++------------------------
>  1 file changed, 19 insertions(+), 24 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [PATCH v5 2/3] qemu-ga: Optimize var declaration and definition

[Konstantin Kostiuk]

[-- Attachment #1: Type: text/plain, Size: 936 bytes --]

Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>

On Wed, Nov 6, 2024 at 3:36 PM Daniel P. Berrangé <berrange@redhat.com>
wrote:

> On Wed, Nov 06, 2024 at 04:41:33PM +0800, Dehan Meng wrote:
> > Variable declarations moved to the beginning of blocks
> > Followed the coding style of using snake_case for variable names.
> > Proper initialization of param 'size_t n' to '0' for
> >
> > Signed-off-by: Dehan Meng <demeng@redhat.com>
> > ---
> >  qga/commands-linux.c | 43 +++++++++++++++++++------------------------
> >  1 file changed, 19 insertions(+), 24 deletions(-)
>
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
>
>
> With regards,
> Daniel
> --
> |: https://berrange.com      -o-
> https://www.flickr.com/photos/dberrange :|
> |: https://libvirt.org         -o-
> https://fstop138.berrange.com :|
> |: https://entangle-photo.org    -o-
> https://www.instagram.com/dberrange :|
>
>

[-- Attachment #2: Type: text/html, Size: 1987 bytes --]

[PATCH v5 3/3] qemu-ga: Avoiding freeing line prematurely

[Dehan Meng]

It's now only freed at the end of the function.

Signed-off-by: Dehan Meng <demeng@redhat.com>
---
 qga/commands-linux.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/qga/commands-linux.c b/qga/commands-linux.c
index 55c35bfc8f..70020621bf 100644
--- a/qga/commands-linux.c
+++ b/qga/commands-linux.c
@@ -2138,8 +2138,7 @@ GuestNetworkRouteList *qmp_guest_network_get_route(Error **errp)
         is_ipv6 = (i == 1);
         fp = fopen(routeFiles[i], "r");
         if (fp == NULL) {
-            error_setg_errno(errp, errno, "open(\"%s\")", routeFiles[i]);
-            free(line);
+            error_setg_errno(errp, errno, "open(\"%s\")", route_files[i]);
             continue;
         }
 
@@ -2148,7 +2147,6 @@ GuestNetworkRouteList *qmp_guest_network_get_route(Error **errp)
                 firstLine = 0;
                 continue;
             }
-            
             if (is_ipv6) {
                 char destination[33], source[33], next_hop[33];
                 int des_prefixlen, src_prefixlen, metric, refcnt, use, flags;
@@ -2215,9 +2213,8 @@ GuestNetworkRouteList *qmp_guest_network_get_route(Error **errp)
             QAPI_LIST_APPEND(tail, route);
         }
 
-        free(line);
         fclose(fp);
     }
-
+    free(line);
     return head;
 }
-- 
2.40.1

Re: [PATCH v5 3/3] qemu-ga: Avoiding freeing line prematurely

[Daniel P. Berrangé]

On Wed, Nov 06, 2024 at 04:41:34PM +0800, Dehan Meng wrote:
> It's now only freed at the end of the function.
> 
> Signed-off-by: Dehan Meng <demeng@redhat.com>
> ---
>  qga/commands-linux.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [PATCH v5 3/3] qemu-ga: Avoiding freeing line prematurely

[Konstantin Kostiuk]

[-- Attachment #1: Type: text/plain, Size: 761 bytes --]

Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>

On Wed, Nov 6, 2024 at 3:38 PM Daniel P. Berrangé <berrange@redhat.com>
wrote:

> On Wed, Nov 06, 2024 at 04:41:34PM +0800, Dehan Meng wrote:
> > It's now only freed at the end of the function.
> >
> > Signed-off-by: Dehan Meng <demeng@redhat.com>
> > ---
> >  qga/commands-linux.c | 7 ++-----
> >  1 file changed, 2 insertions(+), 5 deletions(-)
>
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
>
>
> With regards,
> Daniel
> --
> |: https://berrange.com      -o-
> https://www.flickr.com/photos/dberrange :|
> |: https://libvirt.org         -o-
> https://fstop138.berrange.com :|
> |: https://entangle-photo.org    -o-
> https://www.instagram.com/dberrange :|
>
>

[-- Attachment #2: Type: text/html, Size: 1769 bytes --]

Re: [PATCH v5 3/3] qemu-ga: Avoiding freeing line prematurely

[Konstantin Kostiuk]

[-- Attachment #1: Type: text/plain, Size: 1767 bytes --]

On Wed, Nov 6, 2024 at 10:42 AM Dehan Meng <demeng@redhat.com> wrote:

> It's now only freed at the end of the function.
>
> Signed-off-by: Dehan Meng <demeng@redhat.com>
> ---
>  qga/commands-linux.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/qga/commands-linux.c b/qga/commands-linux.c
> index 55c35bfc8f..70020621bf 100644
> --- a/qga/commands-linux.c
> +++ b/qga/commands-linux.c
> @@ -2138,8 +2138,7 @@ GuestNetworkRouteList
> *qmp_guest_network_get_route(Error **errp)
>          is_ipv6 = (i == 1);
>          fp = fopen(routeFiles[i], "r");
>          if (fp == NULL) {
> -            error_setg_errno(errp, errno, "open(\"%s\")", routeFiles[i]);
> -            free(line);
> +            error_setg_errno(errp, errno, "open(\"%s\")", route_files[i]);
>

Compilation failed

../qga/commands-linux.c:2140:59: error: ‘route_files’ undeclared (first use
in this function); did you mean ‘routeFiles’?
 2140 |             error_setg_errno(errp, errno, "open(\"%s\")",
route_files[i]);



>              continue;
>          }
>
> @@ -2148,7 +2147,6 @@ GuestNetworkRouteList
> *qmp_guest_network_get_route(Error **errp)
>                  firstLine = 0;
>                  continue;
>              }
> -
>              if (is_ipv6) {
>                  char destination[33], source[33], next_hop[33];
>                  int des_prefixlen, src_prefixlen, metric, refcnt, use,
> flags;
> @@ -2215,9 +2213,8 @@ GuestNetworkRouteList
> *qmp_guest_network_get_route(Error **errp)
>              QAPI_LIST_APPEND(tail, route);
>          }
>
> -        free(line);
>          fclose(fp);
>      }
> -
> +    free(line);
>      return head;
>  }
> --
> 2.40.1
>
>

[-- Attachment #2: Type: text/html, Size: 2634 bytes --]