svn commit: r253280 - head/sys/ufs/ffs

[Konstantin Belousov]

Author: kib
Date: Fri Jul 12 18:52:33 2013
New Revision: 253280
URL: http://svnweb.freebsd.org/changeset/base/253280

Log:
  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.
  
  Reported by:	Andre Albsmeier <Andre.Albsmeier at siemens.com>
  Reviewed by:	mckusick
  Sponsored by:	The FreeBSD Foundation
  MFC after:	1 week

Modified:
  head/sys/ufs/ffs/ffs_snapshot.c

Modified: head/sys/ufs/ffs/ffs_snapshot.c
==============================================================================
--- head/sys/ufs/ffs/ffs_snapshot.c	Fri Jul 12 18:13:41 2013	(r253279)
+++ head/sys/ufs/ffs/ffs_snapshot.c	Fri Jul 12 18:52:33 2013	(r253280)
@@ -792,7 +792,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);
 	}
 	/*