From patchwork Wed Apr 20 14:16:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhigang Wang X-Patchwork-Id: 8890241 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1E7E99F441 for ; Wed, 20 Apr 2016 14:19:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 41017201C0 for ; Wed, 20 Apr 2016 14:19:42 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2905E2008F for ; Wed, 20 Apr 2016 14:19:41 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1asswS-0006ba-Ft; Wed, 20 Apr 2016 14:17:20 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1asswR-0006bU-GT for xen-devel@lists.xenproject.org; Wed, 20 Apr 2016 14:17:19 +0000 Received: from [85.158.143.35] by server-1.bemta-6.messagelabs.com id F0/0B-18833-E6F87175; Wed, 20 Apr 2016 14:17:18 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRWlGSWpSXmKPExsUyZ7p8oG5ev3i 4wbbzQhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bp3YdZCho5K/5tPMfawLiPvYuRk0NIYCKT xPtLKV2MXED2b0aJueePsEA4GxkljlzYzwzh9DFKvJr9lamLkYODTUBPYsJlTZBuEQEliXurJ jOB1DALzGSSWLbuCyNIQljAW2LSjxdsIDaLgKrEtc5zrCC9vAKeEn3vjEDCEgJyEtu27AEr5x TQl3j7YiHURXoSPetns0LUGEp83riUeQIj3wJGhlWM6sWpRWWpRbpGeklFmekZJbmJmTm6hgZ mermpxcWJ6ak5iUnFesn5uZsYgWHCAAQ7GJf9dTrEKMnBpCTK+6ZJPFyILyk/pTIjsTgjvqg0 J7X4EKMMB4eSBK9gH1BOsCg1PbUiLTMHGLAwaQkOHiURXgeQNG9xQWJucWY6ROoUo6KUOO/TX qCEAEgiozQPrg0WJZcYZaWEeRmBDhHiKUgtys0sQZV/xSjOwagkzMsBMp4nM68EbvoroMVMQI v574qCLC5JREhJNTAa/bE6mJd8a/cB8eutP9c0qU3o/8b31G71b79C1SyH/b61O9t7vmv7mH+ acfFqhpuAUu4bT3HR7PuHH8wJOzDr5IqdccfnJfVear5pV2i2aOG3Q/5Nm5e/P30pxujlCWPP kH+/ey4mHlU+JsO7Z25CQXGpspToYt+L3/1ddh5sq0pb+lqiUPqEEktxRqKhFnNRcSIADFfsw 40CAAA= X-Env-Sender: zhigang.x.wang@oracle.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1461161836!10480118!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAyODgzMzk=\n X-StarScan-Received: X-StarScan-Version: 8.28; banners=-,-,- X-VirusChecked: Checked Received: (qmail 48147 invoked from network); 20 Apr 2016 14:17:18 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-7.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 20 Apr 2016 14:17:18 -0000 Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u3KEHAaa032714 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 20 Apr 2016 14:17:11 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0022.oracle.com (8.14.4/8.13.8) with ESMTP id u3KEHA7M021383 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 20 Apr 2016 14:17:10 GMT Received: from abhmp0016.oracle.com (abhmp0016.oracle.com [141.146.116.22]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id u3KEH9Hj011509; Wed, 20 Apr 2016 14:17:10 GMT Received: from zhigang.us.oracle.com (/10.149.236.110) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 20 Apr 2016 07:17:09 -0700 From: Zhigang Wang To: xen-devel@lists.xenproject.org Date: Wed, 20 Apr 2016 10:16:35 -0400 Message-Id: <1461161795-28948-1-git-send-email-zhigang.x.wang@oracle.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <20160420113910.GA4311@citrix.com> References: <20160420113910.GA4311@citrix.com> X-Source-IP: userv0022.oracle.com [156.151.31.74] Cc: Wei Liu , Ian Campbell , Stefano Stabellini , Ian Jackson , Zhigang Wang Subject: [Xen-devel] [PATCH] tools/xenstat: handle network interface name in uppercase. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Acked-by: Wei Liu --- 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); }