[Xen-changelog] [xen master] tools/xenstat: handle network interface name in uppercase.

[patchbot@xxxxxxx]

commit 83a5839960db70f3552417379ad2677a6b473b20
Author:     Zhigang Wang <zhigang.x.wang@xxxxxxxxxx>
AuthorDate: Wed Apr 20 10:16:35 2016 -0400
Commit:     Wei Liu <wei.liu2@xxxxxxxxxx>
CommitDate: Wed Apr 20 19:01:33 2016 +0100

    tools/xenstat: handle network interface name in uppercase.
    
    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>
    Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    Release-acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 tools/xenstat/libxenstat/src/xenstat_linux.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/xenstat/libxenstat/src/xenstat_linux.c 
b/tools/xenstat/libxenstat/src/xenstat_linux.c
index 2cc9c7f..907d65f 100644
--- a/tools/xenstat/libxenstat/src/xenstat_linux.c
+++ b/tools/xenstat/libxenstat/src/xenstat_linux.c
@@ -219,8 +219,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) {
+                                       char *tmp2 = strpbrk(tmp, 
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789");
+                                       if (tmp2 != NULL)
+                                               strcpy(iface, tmp2);
+                               }
 
                                memset(tmp, 0, matches[i].rm_eo - 
matches[i].rm_so);
                        }
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog