diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-02-07 15:39:12 -0800 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-05-15 14:59:26 -0700 |
| commit | b8a9f9e183229d163d8ace855cbbb63c209fba3c (patch) | |
| tree | bbc939ff827c9ec3220bc5c6177c9964d45cc1e6 /fs/ext2/balloc.c | |
| parent | f04c6ce2cfaff4b982a6c8ad37e07c14379c111c (diff) | |
| download | linux-stable-b8a9f9e183229d163d8ace855cbbb63c209fba3c.tar.gz linux-stable-b8a9f9e183229d163d8ace855cbbb63c209fba3c.tar.bz2 linux-stable-b8a9f9e183229d163d8ace855cbbb63c209fba3c.zip | |
userns: Convert ext2 to use kuid/kgid where appropriate.
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'fs/ext2/balloc.c')
| -rw-r--r-- | fs/ext2/balloc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c index a8cbe1bc6ad4..030c6d277e14 100644 --- a/fs/ext2/balloc.c +++ b/fs/ext2/balloc.c @@ -1193,8 +1193,9 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi) free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count); if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) && - sbi->s_resuid != current_fsuid() && - (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { + !uid_eq(sbi->s_resuid, current_fsuid()) && + (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) || + !in_group_p (sbi->s_resgid))) { return 0; } return 1; |