[Xen-devel] [PATCH] tools/xenstat: handle network interface name in uppercase.

[Zhigang Wang <zhigang.x.wang@xxxxxxxxxx>]

xentop will segmentation fault in this case:

  # ip link set eth1 down
  # ip link set eth1 name ETH
  # xentop

This patch will let xentop to handle all uppercase network interface name.

Signed-off-by: Zhigang Wang <zhigang.x.wang@xxxxxxxxxx>
---
 tools/xenstat/libxenstat/src/xenstat_linux.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/xenstat/libxenstat/src/xenstat_linux.c 
b/tools/xenstat/libxenstat/src/xenstat_linux.c
index 931b24e..d33eca1 100644
--- a/tools/xenstat/libxenstat/src/xenstat_linux.c
+++ b/tools/xenstat/libxenstat/src/xenstat_linux.c
@@ -101,6 +101,7 @@ int parseNetDevLine(char *line, char *iface, unsigned long 
long *rxBytes, unsign
        /* Temporary/helper variables */
        int ret;
        char *tmp;
+       char *tmp2;
        int i = 0, x = 0, col = 0;
        regex_t r;
        regmatch_t matches[19];
@@ -221,8 +222,11 @@ int parseNetDevLine(char *line, char *iface, unsigned long 
long *rxBytes, unsign
                                }
                                else
                                /* There were errors when parsing this directly 
in RE. strpbrk() helps */
-                               if (iface != NULL)
-                                       strcpy(iface, strpbrk(tmp, 
"abcdefghijklmnopqrstvuwxyz0123456789"));
+                               if (iface != NULL) {
+                                       tmp2 = strpbrk(tmp, 
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789");
+                                       if (tmp2 != NULL)
+                                               strcpy(iface, tmp2);
+                               }
 
                                memset(tmp, 0, matches[i].rm_eo - 
matches[i].rm_so);
                        }
-- 
2.5.0


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel