diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2010-01-09 16:38:37 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2010-01-09 16:38:37 +0000 |
| commit | 8a561b25f13d9f8543e593795b967ef54c32b898 (patch) | |
| tree | 569fa2056f1fb12e1186285477607e3e2af25ab6 /sys-freebsd/freebsd-sources/files | |
| parent | Fix build on sparc (diff) | |
| download | gentoo-2-8a561b25f13d9f8543e593795b967ef54c32b898.tar.gz gentoo-2-8a561b25f13d9f8543e593795b967ef54c32b898.tar.bz2 gentoo-2-8a561b25f13d9f8543e593795b967ef54c32b898.zip | |
add patch for FreeBSD-SA-10:03.zfs
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'sys-freebsd/freebsd-sources/files')
| -rw-r--r-- | sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-zfs712.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-zfs712.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-zfs712.patch new file mode 100644 index 000000000000..814ced29f6a6 --- /dev/null +++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-zfs712.patch @@ -0,0 +1,25 @@ +http://security.freebsd.org/advisories/FreeBSD-SA-10:03.zfs.asc + +Index: sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c +=================================================================== +--- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c (revision 200583) ++++ 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; + } |