From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jeremy Fitzhardinge <jeremy@goop.org>
Subject: [PATCH] xentop: fix sigsegv
Date: Wed, 19 May 2010 10:55:45 -0700
Message-ID: <4BF42621.8030609@goop.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Keir Fraser <keir.fraser@eu.citrix.com>
Cc: Xen-devel <xen-devel@lists.xensource.com>
List-Id: xen-devel@lists.xenproject.org

On my system, I'm getting SIGSEGVs in xentop because xenstat_node_domain()
is returning NULL.  Skip the loop if it does rather than crashing.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

diff -r 9dda78d7af3b -r 5895ad758076 tools/xenstat/libxenstat/src/xenstat_linux.c
--- a/tools/xenstat/libxenstat/src/xenstat_linux.c	Tue May 18 15:38:36 2010 -0700
+++ b/tools/xenstat/libxenstat/src/xenstat_linux.c	Wed May 19 10:53:58 2010 -0700
@@ -294,7 +294,7 @@
 		/* likely using bonding so we alter the configuration for dom0 to have bridge stats */
 		if ((strstr(iface, devBridge) != NULL) && (strstr(iface, devNoBridge) == NULL)) {
 			domain = xenstat_node_domain(node, 0);
-			for (i = 0; i < domain->num_networks; i++) {
+			for (i = 0; domain && i < domain->num_networks; i++) {
 				if ((domain->networks[i].id == 0) && (domain->networks[i].tbytes == 0)
 					&& (domain->networks[i].rbytes == 0)) {
 						domain->networks[i].tbytes = txBytes;