From owner-svn-src-head@FreeBSD.ORG  Fri Mar  8 18:07:44 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 5767639C;
 Fri,  8 Mar 2013 18:07:44 +0000 (UTC)
 (envelope-from dumbbell@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3F579ABF;
 Fri,  8 Mar 2013 18:07:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r28I7iBG006738;
 Fri, 8 Mar 2013 18:07:44 GMT (envelope-from dumbbell@svn.freebsd.org)
Received: (from dumbbell@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r28I7id2006737;
 Fri, 8 Mar 2013 18:07:44 GMT (envelope-from dumbbell@svn.freebsd.org)
Message-Id: <201303081807.r28I7id2006737@svn.freebsd.org>
From: Jean-Sebastien Pedron <dumbbell@FreeBSD.org>
Date: Fri, 8 Mar 2013 18:07:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248058 - head/sys/geom/label
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.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Mar 2013 18:07:44 -0000

Author: dumbbell
Date: Fri Mar  8 18:07:43 2013
New Revision: 248058
URL: http://svnweb.freebsd.org/changeset/base/248058

Log:
  g_label_ntfs_taste: Abort taste is recsize == 0
  
  This will avoid a 0-byte read (in g_read_data()) leading to a panic, if
  previously read data are erroneous.
  
  Suggested by:	John-Mark Gurney <jmg@funkthat.com>

Modified:
  head/sys/geom/label/g_label_ntfs.c

Modified: head/sys/geom/label/g_label_ntfs.c
==============================================================================
--- head/sys/geom/label/g_label_ntfs.c	Fri Mar  8 17:28:40 2013	(r248057)
+++ head/sys/geom/label/g_label_ntfs.c	Fri Mar  8 18:07:43 2013	(r248058)
@@ -115,7 +115,7 @@ g_label_ntfs_taste(struct g_consumer *cp
 
 	mftrecsz = (char)bf->bf_mftrecsz;
 	recsize = (mftrecsz > 0) ? (mftrecsz * bf->bf_bps * bf->bf_spc) : (1 << -mftrecsz);
-	if (recsize % pp->sectorsize != 0)
+	if (recsize == 0 || recsize % pp->sectorsize != 0)
 		goto done;
 
 	voloff = bf->bf_mftcn * bf->bf_spc * bf->bf_bps +