lkml.org 
[lkml]   [2008]   [Apr]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH 3/9] fat: fat_setattr() fix
From
Date


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@mail.parknet.co.jp>
---

fs/fat/file.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)

diff -puN fs/fat/file.c~fat_setattr-fix fs/fat/file.c
--- linux-2.6/fs/fat/file.c~fat_setattr-fix 2008-02-20 15:28:06.000000000 +0900
+++ linux-2.6-hirofumi/fs/fat/file.c 2008-02-21 11:42:25.000000000 +0900
@@ -255,7 +255,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;

@@ -269,7 +270,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;
@@ -308,7 +309,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) {
@@ -317,12 +320,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;
_

\
 
 \ /
  Last update: 2008-04-20 20:27    [W:1.290 / U:0.036 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site