From owner-svn-src-head@freebsd.org  Sun Feb 19 16:08:59 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DBE78CE5BA6;
 Sun, 19 Feb 2017 16:08:59 +0000 (UTC)
 (envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A8E8B19D7;
 Sun, 19 Feb 2017 16:08:59 +0000 (UTC)
 (envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1JG8w1R068830;
 Sun, 19 Feb 2017 16:08:58 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1JG8wAN068829;
 Sun, 19 Feb 2017 16:08:58 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201702191608.v1JG8wAN068829@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: trasz set sender to
 trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Sun, 19 Feb 2017 16:08:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r313943 - head/sbin/mdconfig
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Feb 2017 16:09:00 -0000

Author: trasz
Date: Sun Feb 19 16:08:58 2017
New Revision: 313943
URL: https://svnweb.freebsd.org/changeset/base/313943

Log:
  Make mdconfig(8) not segfault when the kernel returns garbage data.
  
  MFC after:	2 weeks
  Sponsored by:	DARPA, AFRL

Modified:
  head/sbin/mdconfig/mdconfig.c

Modified: head/sbin/mdconfig/mdconfig.c
==============================================================================
--- head/sbin/mdconfig/mdconfig.c	Sun Feb 19 14:53:59 2017	(r313942)
+++ head/sbin/mdconfig/mdconfig.c	Sun Feb 19 16:08:58 2017	(r313943)
@@ -452,8 +452,8 @@ md_list(const char *units, int opt, cons
 			}
 			gc = &pp->lg_config;
 			type = geom_config_get(gc, "type");
-			if (strcmp(type, "vnode") == 0 ||
-			    strcmp(type, "preload") == 0) {
+			if (type != NULL && (strcmp(type, "vnode") == 0 ||
+			    strcmp(type, "preload") == 0)) {
 				file = geom_config_get(gc, "file");
 				if (fflag != NULL &&
 				    strcmp(fflag, file) != 0)