From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andre Przywara Subject: [PATCH] xl: fix strtok() call in vif2 parsing Date: Fri, 20 Aug 2010 13:58:36 +0200 Message-ID: <4C6E6DEC.5030601@amd.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------060508050408050706020403" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: eric.chanudet@citrix.com, Stefano Stabellini Cc: xen-devel , Keir Fraser List-Id: xen-devel@lists.xenproject.org --------------060508050408050706020403 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Hi, according to the manpage subsequent calls to strtok() must use NULL in the string parameter to keep the iteration going. Fix fixes a hang when parsing the vif2 parameter. Regards, Andre. Signed-off-by: Andre Przywara -- Andre Przywara AMD-Operating System Research Center (OSRC), Dresden, Germany Tel: +49 351 448-3567-12 --------------060508050408050706020403 Content-Type: text/x-patch; name="xl-fix-strtok-call-in-vif2-parsing.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="xl-fix-strtok-call-in-vif2-parsing.patch" >>From 1abc666eb715b06c829491626e246fa8b9c8e6e9 Mon Sep 17 00:00:00 2001 From: Andre Przywara Date: Fri, 20 Aug 2010 09:55:43 +0200 Subject: [PATCH 2/4] xl: fix strtok() call in vif2 parsing According to the manpage subsequent calls to strtok() must use NULL in the string parameter to keep the iteration going. Fix fixes a hang when parsing the vif2 parameter. Signed-off-by: Andre Przywara --- tools/libxl/xl_cmdimpl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 323dd04..c291879 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -859,7 +859,7 @@ skip: init_net2_info(net2, d_config->num_vif2s); - for (p = strtok(buf2, ","); p; p = strtok(buf2, ",")) { + for (p = strtok(buf2, ","); p; p = strtok(NULL, ",")) { while (isblank(*p)) p++; if (!strncmp("front_mac=", p, 10)) { -- 1.6.4 --------------060508050408050706020403 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --------------060508050408050706020403--