Author: lcapitulino
Date: Tue Feb 13 14:04:24 2007
New Revision: 120381
Added:
packages/updates/2007.0/kernel-2.6/current/PATCHES/patches/FS14_fix_umask_for_noacl_extn.patch
Modified:
packages/updates/2007.0/kernel-2.6/current/SPECS/kernel-2.6.spec
Log:
Fix umask when noACL kernel meets extN tuned for ACLs
(thanks to Hugh Dickins <[EMAIL PROTECTED]>)
Added:
packages/updates/2007.0/kernel-2.6/current/PATCHES/patches/FS14_fix_umask_for_noacl_extn.patch
==============================================================================
--- (empty file)
+++
packages/updates/2007.0/kernel-2.6/current/PATCHES/patches/FS14_fix_umask_for_noacl_extn.patch
Tue Feb 13 14:04:24 2007
@@ -0,0 +1,61 @@
+[PATCH] fix umask when noACL kernel meets extN tuned for ACLs
+
+Fix insecure default behaviour reported by Tigran Aivazian: if an
+ext2 or ext3 filesystem is tuned to mount with "acl", but mounted by
+a kernel built without ACL support, then umask was ignored when creating
+inodes - though root or user has umask 022, touch creates files as 0666,
+and mkdir creates directories as 0777.
+
+This appears to have worked right until 2.6.11, when a fix to the default
+mode on symlinks (always 0777) assumed VFS applies umask: which it does,
+unless the mount is marked for ACLs; but ext[23] set MS_POSIXACL in
+s_flags according to s_mount_opt set according to def_mount_opts.
+
+We could revert to the 2.6.10 ext[23]_init_acl (adding an S_ISLNK test);
+but other filesystems only set MS_POSIXACL when ACLs are configured. We
+could fix this at another level; but it seems most robust to avoid setting
+the s_mount_opt flag in the first place (at the expense of more ifdefs).
+
+Likewise don't set the XATTR_USER flag when built without XATTR support.
+
+Signed-off-by: Hugh Dickins <[EMAIL PROTECTED]>
+
+---
+ fs/ext2/super.c | 4 ++++
+ fs/ext3/super.c | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+--- linux-2.6.17.orig/fs/ext2/super.c
++++ linux-2.6.17/fs/ext2/super.c
+@@ -710,10 +710,14 @@ static int ext2_fill_super(struct super_
+ set_opt(sbi->s_mount_opt, GRPID);
+ if (def_mount_opts & EXT2_DEFM_UID16)
+ set_opt(sbi->s_mount_opt, NO_UID32);
++#ifdef CONFIG_EXT2_FS_XATTR
+ if (def_mount_opts & EXT2_DEFM_XATTR_USER)
+ set_opt(sbi->s_mount_opt, XATTR_USER);
++#endif
++#ifdef CONFIG_EXT2_FS_POSIX_ACL
+ if (def_mount_opts & EXT2_DEFM_ACL)
+ set_opt(sbi->s_mount_opt, POSIX_ACL);
++#endif
+
+ if (le16_to_cpu(sbi->s_es->s_errors) == EXT2_ERRORS_PANIC)
+ set_opt(sbi->s_mount_opt, ERRORS_PANIC);
+--- linux-2.6.17.orig/fs/ext3/super.c
++++ linux-2.6.17/fs/ext3/super.c
+@@ -1445,10 +1445,14 @@ static int ext3_fill_super (struct super
+ set_opt(sbi->s_mount_opt, GRPID);
+ if (def_mount_opts & EXT3_DEFM_UID16)
+ set_opt(sbi->s_mount_opt, NO_UID32);
++#ifdef CONFIG_EXT3_FS_XATTR
+ if (def_mount_opts & EXT3_DEFM_XATTR_USER)
+ set_opt(sbi->s_mount_opt, XATTR_USER);
++#endif
++#ifdef CONFIG_EXT3_FS_POSIX_ACL
+ if (def_mount_opts & EXT3_DEFM_ACL)
+ set_opt(sbi->s_mount_opt, POSIX_ACL);
++#endif
+ if ((def_mount_opts & EXT3_DEFM_JMODE) == EXT3_DEFM_JMODE_DATA)
+ sbi->s_mount_opt |= EXT3_MOUNT_JOURNAL_DATA;
+ else if ((def_mount_opts & EXT3_DEFM_JMODE) == EXT3_DEFM_JMODE_ORDERED)
Modified: packages/updates/2007.0/kernel-2.6/current/SPECS/kernel-2.6.spec
==============================================================================
--- packages/updates/2007.0/kernel-2.6/current/SPECS/kernel-2.6.spec
(original)
+++ packages/updates/2007.0/kernel-2.6/current/SPECS/kernel-2.6.spec Tue Feb
13 14:04:24 2007
@@ -1043,6 +1043,8 @@
- PCI: ATI sb600 sata quirk (#28363 - thanks to Wolke <[EMAIL PROTECTED]>)
- read_zero_pagealigned() locking fix (thanks to Hugh Dickins
<[EMAIL PROTECTED]>)
+ - Fix umask when noACL kernel meets extN tuned for ACLs
+ (thanks to Hugh Dickins <[EMAIL PROTECTED]>)
* Fri Feb 02 2007 Luiz Capitulino <[EMAIL PROTECTED]> 2.6.17-10mdv2007.0
o Gwenole Beauchesne <[EMAIL PROTECTED]>
