diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2012-06-02 00:14:19 +0200 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-09-21 12:13:25 +0200 |
commit | d2b31ca644fdc8704de3367a6a56a5c958c77f53 (patch) | |
tree | 70967aaec7a5a86ffdd6adf3a45d3b3cb8833678 /security/apparmor | |
parent | userns: Add user namespace support to IMA (diff) | |
download | linux-d2b31ca644fdc8704de3367a6a56a5c958c77f53.tar.xz linux-d2b31ca644fdc8704de3367a6a56a5c958c77f53.zip |
userns: Teach security_path_chown to take kuids and kgids
Don't make the security modules deal with raw user space uid and
gids instead pass in a kuid_t and a kgid_t so that security modules
only have to deal with internal kernel uids and gids.
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: James Morris <james.l.morris@oracle.com>
Cc: John Johansen <john.johansen@canonical.com>
Cc: Kentaro Takeda <takedakn@nttdata.co.jp>
Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'security/apparmor')
-rw-r--r-- | security/apparmor/lsm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index 8ea39aabe948..8c2a7f6b35e2 100644 --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c @@ -352,7 +352,7 @@ static int apparmor_path_chmod(struct path *path, umode_t mode) return common_perm_mnt_dentry(OP_CHMOD, path->mnt, path->dentry, AA_MAY_CHMOD); } -static int apparmor_path_chown(struct path *path, uid_t uid, gid_t gid) +static int apparmor_path_chown(struct path *path, kuid_t uid, kgid_t gid) { struct path_cond cond = { path->dentry->d_inode->i_uid, path->dentry->d_inode->i_mode |