diff options
| -rw-r--r-- | fs/fat/file.c | 182 |
1 files changed, 94 insertions, 88 deletions
diff --git a/fs/fat/file.c b/fs/fat/file.c index 6214287210f5..9b94094c7010 100644 --- a/fs/fat/file.c +++ b/fs/fat/file.c | |||
| @@ -18,106 +18,112 @@ | |||
| 18 | #include <linux/security.h> | 18 | #include <linux/security.h> |
| 19 | #include "fat.h" | 19 | #include "fat.h" |
| 20 | 20 | ||
| 21 | int fat_generic_ioctl(struct inode *inode, struct file *filp, | 21 | static int fat_ioctl_get_attributes(struct inode *inode, u32 __user *user_attr) |
| 22 | unsigned int cmd, unsigned long arg) | ||
| 23 | { | 22 | { |
| 23 | u32 attr; | ||
| 24 | |||
| 25 | mutex_lock(&inode->i_mutex); | ||
| 26 | attr = fat_make_attrs(inode); | ||
| 27 | mutex_unlock(&inode->i_mutex); | ||
| 28 | |||
| 29 | return put_user(attr, user_attr); | ||
| 30 | } | ||
| 31 | |||
| 32 | static int fat_ioctl_set_attributes(struct file *file, u32 __user *user_attr) | ||
| 33 | { | ||
| 34 | struct inode *inode = file->f_path.dentry->d_inode; | ||
| 24 | struct msdos_sb_info *sbi = MSDOS_SB(inode->i_sb); | 35 | struct msdos_sb_info *sbi = MSDOS_SB(inode->i_sb); |
| 25 | u32 __user *user_attr = (u32 __user *)arg; | 36 | int is_dir = S_ISDIR(inode->i_mode); |
| 37 | u32 attr, oldattr; | ||
| 38 | struct iattr ia; | ||
| 39 | int err; | ||
| 26 | 40 | ||
| 27 | switch (cmd) { | 41 | err = get_user(attr, user_attr); |
| 28 | case FAT_IOCTL_GET_ATTRIBUTES: | 42 | if (err) |
| 29 | { | 43 | goto out; |
| 30 | u32 attr; | ||
| 31 | 44 | ||
| 32 | mutex_lock(&inode->i_mutex); | 45 | mutex_lock(&inode->i_mutex); |
| 33 | attr = fat_make_attrs(inode); | 46 | err = mnt_want_write(file->f_path.mnt); |
| 34 | mutex_unlock(&inode->i_mutex); | 47 | if (err) |
| 48 | goto out_unlock_inode; | ||
| 35 | 49 | ||
| 36 | return put_user(attr, user_attr); | 50 | /* |
| 51 | * ATTR_VOLUME and ATTR_DIR cannot be changed; this also | ||
| 52 | * prevents the user from turning us into a VFAT | ||
| 53 | * longname entry. Also, we obviously can't set | ||
| 54 | * any of the NTFS attributes in the high 24 bits. | ||
| 55 | */ | ||
| 56 | attr &= 0xff & ~(ATTR_VOLUME | ATTR_DIR); | ||
| 57 | /* Merge in ATTR_VOLUME and ATTR_DIR */ | ||
| 58 | attr |= (MSDOS_I(inode)->i_attrs & ATTR_VOLUME) | | ||
| 59 | (is_dir ? ATTR_DIR : 0); | ||
| 60 | oldattr = fat_make_attrs(inode); | ||
| 61 | |||
| 62 | /* Equivalent to a chmod() */ | ||
| 63 | ia.ia_valid = ATTR_MODE | ATTR_CTIME; | ||
| 64 | ia.ia_ctime = current_fs_time(inode->i_sb); | ||
| 65 | if (is_dir) | ||
| 66 | ia.ia_mode = fat_make_mode(sbi, attr, S_IRWXUGO); | ||
| 67 | else { | ||
| 68 | ia.ia_mode = fat_make_mode(sbi, attr, | ||
| 69 | S_IRUGO | S_IWUGO | (inode->i_mode & S_IXUGO)); | ||
| 37 | } | 70 | } |
| 38 | case FAT_IOCTL_SET_ATTRIBUTES: | ||
| 39 | { | ||
| 40 | u32 attr, oldattr; | ||
| 41 | int err, is_dir = S_ISDIR(inode->i_mode); | ||
| 42 | struct iattr ia; | ||
| 43 | 71 | ||
| 44 | err = get_user(attr, user_attr); | 72 | /* The root directory has no attributes */ |
| 45 | if (err) | 73 | if (inode->i_ino == MSDOS_ROOT_INO && attr != ATTR_DIR) { |
| 46 | return err; | 74 | err = -EINVAL; |
| 75 | goto out_drop_write; | ||
| 76 | } | ||
| 47 | 77 | ||
| 48 | mutex_lock(&inode->i_mutex); | 78 | if (sbi->options.sys_immutable && |
| 49 | 79 | ((attr | oldattr) & ATTR_SYS) && | |
| 50 | err = mnt_want_write(filp->f_path.mnt); | 80 | !capable(CAP_LINUX_IMMUTABLE)) { |
| 51 | if (err) | 81 | err = -EPERM; |
| 52 | goto up_no_drop_write; | 82 | goto out_drop_write; |
| 53 | 83 | } | |
| 54 | /* | ||
| 55 | * ATTR_VOLUME and ATTR_DIR cannot be changed; this also | ||
| 56 | * prevents the user from turning us into a VFAT | ||
| 57 | * longname entry. Also, we obviously can't set | ||
| 58 | * any of the NTFS attributes in the high 24 bits. | ||
| 59 | */ | ||
| 60 | attr &= 0xff & ~(ATTR_VOLUME | ATTR_DIR); | ||
| 61 | /* Merge in ATTR_VOLUME and ATTR_DIR */ | ||
| 62 | attr |= (MSDOS_I(inode)->i_attrs & ATTR_VOLUME) | | ||
| 63 | (is_dir ? ATTR_DIR : 0); | ||
| 64 | oldattr = fat_make_attrs(inode); | ||
| 65 | |||
| 66 | /* Equivalent to a chmod() */ | ||
| 67 | ia.ia_valid = ATTR_MODE | ATTR_CTIME; | ||
| 68 | ia.ia_ctime = current_fs_time(inode->i_sb); | ||
| 69 | if (is_dir) | ||
| 70 | ia.ia_mode = fat_make_mode(sbi, attr, S_IRWXUGO); | ||
| 71 | else { | ||
| 72 | ia.ia_mode = fat_make_mode(sbi, attr, | ||
| 73 | S_IRUGO | S_IWUGO | (inode->i_mode & S_IXUGO)); | ||
| 74 | } | ||
| 75 | 84 | ||
| 76 | /* The root directory has no attributes */ | 85 | /* |
| 77 | if (inode->i_ino == MSDOS_ROOT_INO && attr != ATTR_DIR) { | 86 | * The security check is questionable... We single |
| 78 | err = -EINVAL; | 87 | * out the RO attribute for checking by the security |
| 79 | goto up; | 88 | * module, just because it maps to a file mode. |
| 80 | } | 89 | */ |
| 90 | err = security_inode_setattr(file->f_path.dentry, &ia); | ||
| 91 | if (err) | ||
| 92 | goto out_drop_write; | ||
| 81 | 93 | ||
| 82 | if (sbi->options.sys_immutable) { | 94 | /* This MUST be done before doing anything irreversible... */ |
| 83 | if ((attr | oldattr) & ATTR_SYS) { | 95 | err = fat_setattr(file->f_path.dentry, &ia); |
| 84 | if (!capable(CAP_LINUX_IMMUTABLE)) { | 96 | if (err) |
| 85 | err = -EPERM; | 97 | goto out_drop_write; |
| 86 | goto up; | 98 | |
| 87 | } | 99 | fsnotify_change(file->f_path.dentry, ia.ia_valid); |
| 88 | } | 100 | if (sbi->options.sys_immutable) { |
| 89 | } | 101 | if (attr & ATTR_SYS) |
| 102 | inode->i_flags |= S_IMMUTABLE; | ||
| 103 | else | ||
| 104 | inode->i_flags &= S_IMMUTABLE; | ||
| 105 | } | ||
| 90 | 106 | ||
| 91 | /* | 107 | fat_save_attrs(inode, attr); |
| 92 | * The security check is questionable... We single | 108 | mark_inode_dirty(inode); |
| 93 | * out the RO attribute for checking by the security | 109 | out_drop_write: |
| 94 | * module, just because it maps to a file mode. | 110 | mnt_drop_write(file->f_path.mnt); |
| 95 | */ | 111 | out_unlock_inode: |
| 96 | err = security_inode_setattr(filp->f_path.dentry, &ia); | 112 | mutex_unlock(&inode->i_mutex); |
| 97 | if (err) | 113 | out: |
| 98 | goto up; | 114 | return err; |
| 99 | 115 | } | |
| 100 | /* This MUST be done before doing anything irreversible... */ | ||
| 101 | err = fat_setattr(filp->f_path.dentry, &ia); | ||
| 102 | if (err) | ||
| 103 | goto up; | ||
| 104 | |||
| 105 | fsnotify_change(filp->f_path.dentry, ia.ia_valid); | ||
| 106 | if (sbi->options.sys_immutable) { | ||
| 107 | if (attr & ATTR_SYS) | ||
| 108 | inode->i_flags |= S_IMMUTABLE; | ||
| 109 | else | ||
| 110 | inode->i_flags &= S_IMMUTABLE; | ||
| 111 | } | ||
| 112 | 116 | ||
| 113 | fat_save_attrs(inode, attr); | 117 | int fat_generic_ioctl(struct inode *inode, struct file *filp, |
| 114 | mark_inode_dirty(inode); | 118 | unsigned int cmd, unsigned long arg) |
| 115 | up: | 119 | { |
| 116 | mnt_drop_write(filp->f_path.mnt); | 120 | u32 __user *user_attr = (u32 __user *)arg; |
| 117 | up_no_drop_write: | 121 | |
| 118 | mutex_unlock(&inode->i_mutex); | 122 | switch (cmd) { |
| 119 | return err; | 123 | case FAT_IOCTL_GET_ATTRIBUTES: |
| 120 | } | 124 | return fat_ioctl_get_attributes(inode, user_attr); |
| 125 | case FAT_IOCTL_SET_ATTRIBUTES: | ||
| 126 | return fat_ioctl_set_attributes(filp, user_attr); | ||
| 121 | default: | 127 | default: |
| 122 | return -ENOTTY; /* Inappropriate ioctl for device */ | 128 | return -ENOTTY; /* Inappropriate ioctl for device */ |
| 123 | } | 129 | } |
