From owner-svn-src-stable-7@FreeBSD.ORG  Fri Feb 13 19:49:35 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B19D41065674;
	Fri, 13 Feb 2009 19:49:35 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9E8E08FC17;
	Fri, 13 Feb 2009 19:49:35 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1DJnZRQ097706;
	Fri, 13 Feb 2009 19:49:35 GMT (envelope-from lulf@svn.freebsd.org)
Received: (from lulf@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1DJnZLj097705;
	Fri, 13 Feb 2009 19:49:35 GMT (envelope-from lulf@svn.freebsd.org)
Message-Id: <200902131949.n1DJnZLj097705@svn.freebsd.org>
From: Ulf Lilleengen <lulf@FreeBSD.org>
Date: Fri, 13 Feb 2009 19:49:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188596 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb geom/label
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Feb 2009 19:49:36 -0000

Author: lulf
Date: Fri Feb 13 19:49:35 2009
New Revision: 188596
URL: http://svn.freebsd.org/changeset/base/188596

Log:
  MFC r188492:
  - Use the correct argument when determining the buffer size.
  
  PR:		kern/131575

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/geom/label/g_label_msdosfs.c

Modified: stable/7/sys/geom/label/g_label_msdosfs.c
==============================================================================
--- stable/7/sys/geom/label/g_label_msdosfs.c	Fri Feb 13 19:25:35 2009	(r188595)
+++ stable/7/sys/geom/label/g_label_msdosfs.c	Fri Feb 13 19:49:35 2009	(r188596)
@@ -186,7 +186,7 @@ g_label_msdosfs_taste(struct g_consumer 
 				    FAT_DES_ATTR_VOLUME_ID) {
 					strlcpy(label, pfat_entry->DIR_Name,
 					    MIN(size,
-					    sizeof(pfat_bsbpb->BS_VolLab) + 1));
+					    sizeof(pfat_entry->DIR_Name) + 1));
 					goto endofchecks;
 				}
 			} while((uint8_t *)(++pfat_entry) <