svn commit: r188596 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb geom/label

[Ulf Lilleengen]

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) <