Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757718AbYGANCt (ORCPT ); Tue, 1 Jul 2008 09:02:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754962AbYGANCD (ORCPT ); Tue, 1 Jul 2008 09:02:03 -0400 Received: from fxip-0047f.externet.hu ([88.209.222.127]:44036 "EHLO pomaz-ex.szeredi.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755207AbYGANCA (ORCPT ); Tue, 1 Jul 2008 09:02:00 -0400 Message-Id: <20080701130154.992343794@szeredi.hu> References: <20080701130125.529844715@szeredi.hu> User-Agent: quilt/0.45-1 Date: Tue, 01 Jul 2008 15:01:28 +0200 From: Miklos Szeredi To: viro@ZenIV.linux.org.uk Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, hch@infradead.org, akpm@linux-foundation.org, OGAWA Hirofumi Subject: [patch 3/4] fat: dont call notify_change Content-Disposition: inline; filename=fat-dont-call-notify_change.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3061 Lines: 85 From: Miklos Szeredi The FAT_IOCTL_SET_ATTRIBUTES ioctl() calls notify_change() to change the file mode before changing the inode attributes. Replace with explicit calls to security_inode_setattr(), fat_setattr() and fsnotify_change(). This is equivalent to the original. The reason it is needed, is that later in the series we move the immutable check into notify_change(). That would break the FAT_IOCTL_SET_ATTRIBUTES ioctl, as it needs to perform the mode change regardless of the immutability of the file. [Fix error if fat is built as a module. Thanks to OGAWA Hirofumi for noticing.] Signed-off-by: Miklos Szeredi Acked-by: OGAWA Hirofumi --- fs/fat/file.c | 15 ++++++++++++++- security/security.c | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) Index: linux-2.6/fs/fat/file.c =================================================================== --- linux-2.6.orig/fs/fat/file.c 2008-06-27 22:09:08.000000000 +0200 +++ linux-2.6/fs/fat/file.c 2008-07-01 13:52:26.000000000 +0200 @@ -16,6 +16,8 @@ #include #include #include +#include +#include int fat_generic_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg) @@ -65,6 +67,7 @@ int fat_generic_ioctl(struct inode *inod /* Equivalent to a chmod() */ ia.ia_valid = ATTR_MODE | ATTR_CTIME; + ia.ia_ctime = current_fs_time(inode->i_sb); if (is_dir) { ia.ia_mode = MSDOS_MKMODE(attr, S_IRWXUGO & ~sbi->options.fs_dmask) @@ -91,11 +94,21 @@ int fat_generic_ioctl(struct inode *inod } } + /* + * The security check is questionable... We single + * out the RO attribute for checking by the security + * module, just because it maps to a file mode. + */ + err = security_inode_setattr(filp->f_path.dentry, &ia); + if (err) + goto up; + /* This MUST be done before doing anything irreversible... */ - err = notify_change(filp->f_path.dentry, &ia); + err = fat_setattr(filp->f_path.dentry, &ia); if (err) goto up; + fsnotify_change(filp->f_path.dentry, ia.ia_valid); if (sbi->options.sys_immutable) { if (attr & ATTR_SYS) inode->i_flags |= S_IMMUTABLE; Index: linux-2.6/security/security.c =================================================================== --- linux-2.6.orig/security/security.c 2008-06-27 22:09:08.000000000 +0200 +++ linux-2.6/security/security.c 2008-07-01 13:52:26.000000000 +0200 @@ -476,6 +476,7 @@ int security_inode_setattr(struct dentry return 0; return security_ops->inode_setattr(dentry, attr); } +EXPORT_SYMBOL_GPL(security_inode_setattr); int security_inode_getattr(struct vfsmount *mnt, struct dentry *dentry) { -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/