[Glibc-bsd-commits] r2924 - in trunk/kfreebsd-7/debian: . patches

[Aurelien Jarno]

Author: aurel32
Date: 2010-01-14 05:40:13 +0000 (Thu, 14 Jan 2010)
New Revision: 2924

Added:
   trunk/kfreebsd-7/debian/patches/000_zfs.diff
Modified:
   trunk/kfreebsd-7/debian/changelog
   trunk/kfreebsd-7/debian/patches/series
Log:
  * Fix ZFS ZIL playback with insecure permissions
    (FreeBSD-SA-10:03.zfs).
      - 000_zfs.diff



Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog	2010-01-13 08:08:13 UTC (rev 2923)
+++ trunk/kfreebsd-7/debian/changelog	2010-01-14 05:40:13 UTC (rev 2924)
@@ -1,8 +1,11 @@
 kfreebsd-7 (7.2-10) UNRELEASED; urgency=low
 
   * Add BOOTP kernel options for NFS Root support. Closes: #550429.
+  * Fix ZFS ZIL playback with insecure permissions
+    (FreeBSD-SA-10:03.zfs).
+      - 000_zfs.diff
 
- -- Aurelien Jarno <aurel32 at debian.org>  Mon, 12 Oct 2009 10:58:56 +0200
+ -- Aurelien Jarno <aurel32 at debian.org>  Thu, 14 Jan 2010 06:39:54 +0100
 
 kfreebsd-7 (7.2-9) unstable; urgency=high
 

Added: trunk/kfreebsd-7/debian/patches/000_zfs.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/000_zfs.diff	                        (rev 0)
+++ trunk/kfreebsd-7/debian/patches/000_zfs.diff	2010-01-14 05:40:13 UTC (rev 2924)
@@ -0,0 +1,21 @@
+--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c	(revision 200583)
++++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c	(working copy)
+@@ -60,10 +60,14 @@ zfs_init_vattr(vattr_t *vap, uint64_t mask, uint64
+ {
+ 	VATTR_NULL(vap);
+ 	vap->va_mask = (uint_t)mask;
+-	vap->va_type = IFTOVT(mode);
+-	vap->va_mode = mode & MODEMASK;
+-	vap->va_uid = (uid_t)uid;
+-	vap->va_gid = (gid_t)gid;
++	if (mask & AT_TYPE)
++		vap->va_type = IFTOVT(mode);
++	if (mask & AT_MODE)
++		vap->va_mode = mode & MODEMASK;
++	if (mask & AT_UID)
++		vap->va_uid = (uid_t)uid;
++	if (mask & AT_GID)
++		vap->va_gid = (gid_t)gid;
+ 	vap->va_rdev = zfs_cmpldev(rdev);
+ 	vap->va_nodeid = nodeid;
+ }

Modified: trunk/kfreebsd-7/debian/patches/series
===================================================================
--- trunk/kfreebsd-7/debian/patches/series	2010-01-13 08:08:13 UTC (rev 2923)
+++ trunk/kfreebsd-7/debian/patches/series	2010-01-14 05:40:13 UTC (rev 2924)
@@ -3,6 +3,7 @@
 001_misc.diff
 000_devfs.diff
 000_null.diff
+000_zfs.diff
 003_glibc_dev_aicasm.diff
 004_xargs.diff
 005_binutils.diff