[PULL 0/3] QGA fixes for guest_network_get_route command for 9.2

[PULL 0/3] QGA fixes for guest_network_get_route command for 9.2

[Konstantin Kostiuk]

The following changes since commit f15f7273ea55472d5904c53566c82369d81214c1:

  Merge tag 'pull-target-arm-20241105' of https://git.linaro.org/people/pmaydell/qemu-arm into staging (2024-11-05 21:27:18 +0000)

are available in the Git repository at:

  https://github.com/kostyanf14/qemu.git tags/qga-pull-2024-11-07

for you to fetch changes up to 5ab1c032e6eea810142eb918c57222464482756f:

  qemu-ga: Avoiding freeing line prematurely (2024-11-07 12:28:20 +0200)

----------------------------------------------------------------
qga-pull-2024-11-07

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

 qga/commands-linux.c | 136 +++++++++++++++++++++++++--------------------------
 1 file changed, 66 insertions(+), 70 deletions(-)

--
2.47.0

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

[Konstantin Kostiuk]

From: Dehan Meng <demeng@redhat.com>

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>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Message-ID: <20241107102155.57573-2-kkostiuk@redhat.com>
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
---
 qga/commands-linux.c | 83 +++++++++++++++++++++++---------------------
 1 file changed, 44 insertions(+), 39 deletions(-)

diff --git a/qga/commands-linux.c b/qga/commands-linux.c
index 9b1746b24f..eaf53e1c17 100644
--- a/qga/commands-linux.c
+++ b/qga/commands-linux.c
@@ -2102,7 +2102,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);

@@ -2144,9 +2146,9 @@ GuestNetworkRouteList *qmp_guest_network_get_route(Error **errp)
                 firstLine = 0;
                 continue;
             }
-            GuestNetworkRoute *route = NULL;
-            GuestNetworkRoute *networkroute;
             char Iface[IFNAMSIZ];
+            g_autoptr(GuestNetworkRoute) route = g_new0(GuestNetworkRoute, 1);
+
             if (is_ipv6) {
                 char Destination[33], Source[33], NextHop[33];
                 int DesPrefixlen, SrcPrefixlen, Metric, RefCnt, Use, Flags;
@@ -2159,26 +2161,27 @@ 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(
+                route->iface = g_strdup(Iface);
+                route->destination = hexToIPAddress(Destination, 1);
+                if (route->destination == NULL) {
+                    continue;
+                }
+                route->metric = Metric;
+                route->source = hexToIPAddress(Source, 1);
+                route->desprefixlen = g_strdup_printf(
                     "%d", DesPrefixlen
                 );
-                networkroute->srcprefixlen = g_strdup_printf(
+                route->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;
+                route->nexthop = hexToIPAddress(NextHop, 1);
+                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;
@@ -2190,29 +2193,31 @@ 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;
+                route->iface = g_strdup(Iface);
+                route->destination = hexToIPAddress(&Destination, 0);
+                if (route->destination == NULL) {
+                    continue;
+                }
+                route->gateway = hexToIPAddress(&Gateway, 0);
+                route->mask = hexToIPAddress(&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);
+            route = NULL;
         }

         free(line);
--
2.47.0

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

[Konstantin Kostiuk]

From: Dehan Meng <demeng@redhat.com>

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>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Message-ID: <20241107102155.57573-3-kkostiuk@redhat.com>
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
---
 qga/commands-linux.c | 92 ++++++++++++++++++++------------------------
 1 file changed, 42 insertions(+), 50 deletions(-)

diff --git a/qga/commands-linux.c b/qga/commands-linux.c
index eaf53e1c17..b0704ad423 100644
--- a/qga/commands-linux.c
+++ b/qga/commands-linux.c
@@ -2093,12 +2093,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++) {
@@ -2110,11 +2110,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);
     }
@@ -2123,20 +2123,21 @@ static char *hexToIPAddress(const void *hexValue, int is_ipv6)
 GuestNetworkRouteList *qmp_guest_network_get_route(Error **errp)
 {
     GuestNetworkRouteList *head = NULL, **tail = &head;
-    const char *routeFiles[] = {"/proc/net/route", "/proc/net/ipv6_route"};
+    const char *route_files[] = {"/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;
         is_ipv6 = (i == 1);
-        fp = fopen(routeFiles[i], "r");
+        fp = fopen(route_files[i], "r");
         if (fp == NULL) {
-            error_setg_errno(errp, errno, "open(\"%s\")", routeFiles[i]);
+            error_setg_errno(errp, errno, "open(\"%s\")", route_files[i]);
             free(line);
             continue;
         }
@@ -2146,73 +2147,64 @@ GuestNetworkRouteList *qmp_guest_network_get_route(Error **errp)
                 firstLine = 0;
                 continue;
             }
-            char Iface[IFNAMSIZ];
             g_autoptr(GuestNetworkRoute) route = g_new0(GuestNetworkRoute, 1);

             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;
                 }

-                route->iface = g_strdup(Iface);
-                route->destination = hexToIPAddress(Destination, 1);
+                route->destination = hex_to_ip_address(destination, 1);
                 if (route->destination == NULL) {
                     continue;
                 }
-                route->metric = Metric;
-                route->source = hexToIPAddress(Source, 1);
-                route->desprefixlen = g_strdup_printf(
-                    "%d", DesPrefixlen
-                );
-                route->srcprefixlen = g_strdup_printf(
-                    "%d", SrcPrefixlen
-                );
-                route->nexthop = hexToIPAddress(NextHop, 1);
+                route->iface = g_strdup(iface);
+                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->flags = flags;
                 route->has_refcnt = true;
-                route->refcnt = RefCnt;
+                route->refcnt = refcnt;
                 route->has_use = true;
-                route->use = Use;
+                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;
                 }

-                route->iface = g_strdup(Iface);
-                route->destination = hexToIPAddress(&Destination, 0);
+                route->destination = hex_to_ip_address(&destination, 0);
                 if (route->destination == NULL) {
                     continue;
                 }
-                route->gateway = hexToIPAddress(&Gateway, 0);
-                route->mask = hexToIPAddress(&Mask, 0);
-                route->metric = Metric;
+                route->iface = g_strdup(iface);
+                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->flags = flags;
                 route->has_refcnt = true;
-                route->refcnt = RefCnt;
+                route->refcnt = refcnt;
                 route->has_use = true;
-                route->use = Use;
+                route->use = use;
                 route->has_mtu = true;
-                route->mtu = MTU;
+                route->mtu = mtu;
                 route->has_window = true;
-                route->window = Window;
+                route->window = window;
                 route->has_irtt = true;
-                route->irtt = IRTT;
+                route->irtt = irtt;
                 route->version = 4;
             }

--
2.47.0

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

[Konstantin Kostiuk]

From: Dehan Meng <demeng@redhat.com>

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

Signed-off-by: Dehan Meng <demeng@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Message-ID: <20241107102155.57573-4-kkostiuk@redhat.com>
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
---
 qga/commands-linux.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/qga/commands-linux.c b/qga/commands-linux.c
index b0704ad423..cf077eb03d 100644
--- a/qga/commands-linux.c
+++ b/qga/commands-linux.c
@@ -2138,7 +2138,6 @@ GuestNetworkRouteList *qmp_guest_network_get_route(Error **errp)
         fp = fopen(route_files[i], "r");
         if (fp == NULL) {
             error_setg_errno(errp, errno, "open(\"%s\")", route_files[i]);
-            free(line);
             continue;
         }

@@ -2212,9 +2211,9 @@ GuestNetworkRouteList *qmp_guest_network_get_route(Error **errp)
             route = NULL;
         }

-        free(line);
         fclose(fp);
     }

+    free(line);
     return head;
 }
--
2.47.0

Re: [PULL 0/3] QGA fixes for guest_network_get_route command for 9.2

[Peter Maydell]

On Thu, 7 Nov 2024 at 10:40, Konstantin Kostiuk <kkostiuk@redhat.com> wrote:
>
> The following changes since commit f15f7273ea55472d5904c53566c82369d81214c1:
>
>   Merge tag 'pull-target-arm-20241105' of https://git.linaro.org/people/pmaydell/qemu-arm into staging (2024-11-05 21:27:18 +0000)
>
> are available in the Git repository at:
>
>   https://github.com/kostyanf14/qemu.git tags/qga-pull-2024-11-07
>
> for you to fetch changes up to 5ab1c032e6eea810142eb918c57222464482756f:
>
>   qemu-ga: Avoiding freeing line prematurely (2024-11-07 12:28:20 +0200)
>
> ----------------------------------------------------------------
> qga-pull-2024-11-07
>


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/9.2
for any user-visible changes.

-- PMM

Re: [PULL 0/3] QGA fixes for guest_network_get_route command for 9.2

[Konstantin Kostiuk]

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

Hi Peter,

Please update me regarding the coverity issues. Is everything fixed or not?

Best Regards,
Konstantin Kostiuk.


On Fri, Nov 8, 2024 at 12:22 PM Peter Maydell <peter.maydell@linaro.org>
wrote:

> On Thu, 7 Nov 2024 at 10:40, Konstantin Kostiuk <kkostiuk@redhat.com>
> wrote:
> >
> > The following changes since commit
> f15f7273ea55472d5904c53566c82369d81214c1:
> >
> >   Merge tag 'pull-target-arm-20241105' of
> https://git.linaro.org/people/pmaydell/qemu-arm into staging (2024-11-05
> 21:27:18 +0000)
> >
> > are available in the Git repository at:
> >
> >   https://github.com/kostyanf14/qemu.git tags/qga-pull-2024-11-07
> >
> > for you to fetch changes up to 5ab1c032e6eea810142eb918c57222464482756f:
> >
> >   qemu-ga: Avoiding freeing line prematurely (2024-11-07 12:28:20 +0200)
> >
> > ----------------------------------------------------------------
> > qga-pull-2024-11-07
> >
>
>
> Applied, thanks.
>
> Please update the changelog at https://wiki.qemu.org/ChangeLog/9.2
> for any user-visible changes.
>
> -- PMM
>
>

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

Re: [PULL 0/3] QGA fixes for guest_network_get_route command for 9.2

[Peter Maydell]

On Fri, 8 Nov 2024 at 11:29, Konstantin Kostiuk <kkostiuk@redhat.com> wrote:
>
> Hi Peter,
>
> Please update me regarding the coverity issues. Is everything fixed or not?

We won't know until Coverity does another run, which we do about
once a day.

You can look at the status of the issues yourself in
https://scan.coverity.com/projects/qemu?tab=overview
(you'll need to create an account if you don't already
have one; there's an approval process but I try to
approve new applications quickly).

thanks
-- PMM