The patch titled
fat: fat_setattr() fix
has been removed from the -mm tree. Its filename was
fat-fat_setattr-fix.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: fat: fat_setattr() fix
From: OGAWA Hirofumi <hirofumi@xxxxxxxxxxxxxxxxxx>
Fix fat_setattr() on the case of showexec option. If user specified
showexec option, inode->i_mode may not have S_IXUGO. This just use
inode->i_mode to fix it.
And with this patch, we don't allow chmod() on memory inode, it's just
bad behaviour. IOW, we allow changing S_IWUGO only which can be stored
to disk.
Signed-off-by: OGAWA Hirofumi <hirofumi@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/fat/file.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff -puN fs/fat/file.c~fat-fat_setattr-fix fs/fat/file.c
--- a/fs/fat/file.c~fat-fat_setattr-fix
+++ a/fs/fat/file.c
@@ -257,7 +257,8 @@ int fat_getattr(struct vfsmount *mnt, st
}
EXPORT_SYMBOL_GPL(fat_getattr);
-static int fat_check_mode(const struct msdos_sb_info *sbi, mode_t mode)
+static int fat_check_mode(const struct msdos_sb_info *sbi, struct inode *inode,
+ mode_t mode)
{
mode_t mask, req = mode & ~S_IFMT;
@@ -271,7 +272,7 @@ static int fat_check_mode(const struct m
* w bits, either all (subject to umask) or none must be present.
*/
req &= ~mask;
- if ((req & (S_IRUGO | S_IXUGO)) != ((S_IRUGO | S_IXUGO) & ~mask))
+ if ((req & (S_IRUGO | S_IXUGO)) != (inode->i_mode & (S_IRUGO|S_IXUGO)))
return -EPERM;
if ((req & S_IWUGO) && ((req & S_IWUGO) != (S_IWUGO & ~mask)))
return -EPERM;
@@ -310,7 +311,9 @@ int fat_setattr(struct dentry *dentry, s
if (((attr->ia_valid & ATTR_UID) &&
(attr->ia_uid != sbi->options.fs_uid)) ||
((attr->ia_valid & ATTR_GID) &&
- (attr->ia_gid != sbi->options.fs_gid)))
+ (attr->ia_gid != sbi->options.fs_gid)) ||
+ ((attr->ia_valid & ATTR_MODE) &&
+ fat_check_mode(sbi, inode, attr->ia_mode) < 0))
error = -EPERM;
if (error) {
@@ -319,12 +322,6 @@ int fat_setattr(struct dentry *dentry, s
goto out;
}
- if (attr->ia_valid & ATTR_MODE) {
- error = fat_check_mode(sbi, attr->ia_mode);
- if (error != 0 && !sbi->options.quiet)
- goto out;
- }
-
error = inode_setattr(inode, attr);
if (error)
goto out;
_
Patches currently in -mm which might be from hirofumi@xxxxxxxxxxxxxxxxxx are
origin.patch
vfs-fix-unconditional-write_super-call-in-file_fsync.patch
fat-use-get-put_unaligned_-helpers.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
