CRED: Wrap task credential accesses in the Ext2 filesystem
Wrap access to task credentials so that they can be separated more easily from the task_struct during the introduction of COW creds. Change most current->(|e|s|fs)[ug]id to current_(|e|s|fs)[ug]id(). Change some task->e?[ug]id to task_e?[ug]id(). In some places it makes more sense to use RCU directly rather than a convenient wrapper; these will be addressed by later patches. Signed-off-by: David Howells <dhowells@redhat.com> Reviewed-by: James Morris <jmorris@namei.org> Acked-by: Serge Hallyn <serue@us.ibm.com> Cc: linux-ext4@vger.kernel.org Signed-off-by: James Morris <jmorris@namei.org>
This commit is contained in:
Родитель
4eea03539d
Коммит
a8dd4d67bd
|
@ -1193,7 +1193,7 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
|
||||||
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
|
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
|
||||||
root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
|
root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
|
||||||
if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
|
if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
|
||||||
sbi->s_resuid != current->fsuid &&
|
sbi->s_resuid != current_fsuid() &&
|
||||||
(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
|
(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -550,7 +550,7 @@ got:
|
||||||
|
|
||||||
sb->s_dirt = 1;
|
sb->s_dirt = 1;
|
||||||
mark_buffer_dirty(bh2);
|
mark_buffer_dirty(bh2);
|
||||||
inode->i_uid = current->fsuid;
|
inode->i_uid = current_fsuid();
|
||||||
if (test_opt (sb, GRPID))
|
if (test_opt (sb, GRPID))
|
||||||
inode->i_gid = dir->i_gid;
|
inode->i_gid = dir->i_gid;
|
||||||
else if (dir->i_mode & S_ISGID) {
|
else if (dir->i_mode & S_ISGID) {
|
||||||
|
@ -558,7 +558,7 @@ got:
|
||||||
if (S_ISDIR(mode))
|
if (S_ISDIR(mode))
|
||||||
mode |= S_ISGID;
|
mode |= S_ISGID;
|
||||||
} else
|
} else
|
||||||
inode->i_gid = current->fsgid;
|
inode->i_gid = current_fsgid();
|
||||||
inode->i_mode = mode;
|
inode->i_mode = mode;
|
||||||
|
|
||||||
inode->i_ino = ino;
|
inode->i_ino = ino;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче