svn commit: r253465 - stable/9/sys/ufs/ffs

[Konstantin Belousov]

Author: kib
Date: Fri Jul 19 05:32:08 2013
New Revision: 253465
URL: http://svnweb.freebsd.org/changeset/base/253465

Log:
  MFC r253280:
  Only copy as much bytes as there in superblock, instead of the full
  block copy, when copying the superblock into the snapshot.  UFS1 does
  not align superblock on the block boundary, and bcopy runs off the end
  of the buffer.
  
  Approved by:	re (hrs)

Modified:
  stable/9/sys/ufs/ffs/ffs_snapshot.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/ufs/ffs/ffs_snapshot.c
==============================================================================
--- stable/9/sys/ufs/ffs/ffs_snapshot.c	Fri Jul 19 05:28:47 2013	(r253464)
+++ stable/9/sys/ufs/ffs/ffs_snapshot.c	Fri Jul 19 05:32:08 2013	(r253465)
@@ -790,7 +790,7 @@ out1:
 		brelse(nbp);
 	} else {
 		loc = blkoff(fs, fs->fs_sblockloc);
-		bcopy((char *)copy_fs, &nbp->b_data[loc], fs->fs_bsize);
+		bcopy((char *)copy_fs, &nbp->b_data[loc], (u_int)fs->fs_sbsize);
 		bawrite(nbp);
 	}
 	/*