From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758928AbYEPQew (ORCPT ); Fri, 16 May 2008 12:34:52 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756799AbYEPQck (ORCPT ); Fri, 16 May 2008 12:32:40 -0400 Received: from fxip-0047f.externet.hu ([88.209.222.127]:33715 "EHLO pomaz-ex.szeredi.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756743AbYEPQcg (ORCPT ); Fri, 16 May 2008 12:32:36 -0400 Message-Id: <20080516163222.235825996@szeredi.hu> References: <20080516163136.560107038@szeredi.hu> User-Agent: quilt/0.45-1 Date: Fri, 16 May 2008 18:31:43 +0200 From: Miklos Szeredi To: akpm@linux-foundation.org Cc: hch@infradead.org, viro@ZenIV.linux.org.uk, ezk@cs.sunysb.edu, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, OGAWA Hirofumi Subject: [patch 07/22] fat: dont call notify_change Content-Disposition: inline; filename=fat_notify_change_cleanup.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Signed-off-by: Miklos Szeredi CC: OGAWA Hirofumi --- fs/fat/file.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) Index: linux-2.6/fs/fat/file.c =================================================================== --- linux-2.6.orig/fs/fat/file.c 2008-05-16 17:50:35.000000000 +0200 +++ linux-2.6/fs/fat/file.c 2008-05-16 17:50:45.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; --