From owner-svn-src-head@FreeBSD.ORG  Tue Mar  5 11:02:05 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 9E67AE4C;
 Tue,  5 Mar 2013 11:02:05 +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 91F406FC;
 Tue,  5 Mar 2013 11:02:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r25B25Di043600;
 Tue, 5 Mar 2013 11:02:05 GMT (envelope-from dumbbell@svn.freebsd.org)
Received: (from dumbbell@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r25B25Db043599;
 Tue, 5 Mar 2013 11:02:05 GMT (envelope-from dumbbell@svn.freebsd.org)
Message-Id: <201303051102.r25B25Db043599@svn.freebsd.org>
From: Jean-Sebastien Pedron <dumbbell@FreeBSD.org>
Date: Tue, 5 Mar 2013 11:02:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r247837 - 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: Tue, 05 Mar 2013 11:02:05 -0000

Author: dumbbell
Date: Tue Mar  5 11:02:05 2013
New Revision: 247837
URL: http://svnweb.freebsd.org/changeset/base/247837

Log:
  g_label_ntfs.c: Mark structures as __packed
  
  Without this, read data is mis-interpreted. This could trigger a panic,
  as was the case on one computer where computed "recsize" was zero,
  leading to a call to g_read_page() asking for 0 bytes.

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	Tue Mar  5 10:18:48 2013	(r247836)
+++ head/sys/geom/label/g_label_ntfs.c	Tue Mar  5 11:02:05 2013	(r247837)
@@ -55,7 +55,7 @@ struct ntfs_attr {
 	uint16_t	reserved3;
 	uint16_t	a_dataoff;
 	uint16_t	a_indexed;
-};
+} __packed;
 
 struct ntfs_filerec {
 	uint32_t	fr_hdrmagic;
@@ -70,7 +70,7 @@ struct ntfs_filerec {
 	uint32_t	fr_allocated;
 	uint64_t	fr_mainrec;
 	uint16_t	fr_attrnum;
-};
+} __packed;
 
 struct ntfs_bootfile {
 	uint8_t		reserved1[3];
@@ -89,7 +89,7 @@ struct ntfs_bootfile {
 	uint8_t		bf_mftrecsz;
 	uint32_t	bf_ibsz;
 	uint32_t	bf_volsn;
-};
+} __packed;
 
 static void
 g_label_ntfs_taste(struct g_consumer *cp, char *label, size_t size)