diff options
| author | James Morris <james.l.morris@oracle.com> | 2012-03-15 14:43:02 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-03-15 14:43:02 +1100 |
| commit | b01d3fb921df9baef1ecd13704f4b1e269b58b6b (patch) | |
| tree | 1ca714b40774cd56c0194abee5c6577b2ba6aad2 /security/apparmor/domain.c | |
| parent | 6041e8346f2165679c2184cab60db768d6a26a1d (diff) | |
| parent | 2d4cee7e3a2b9f9c3237672cc136e20dbad0e2ce (diff) | |
| download | blackbird-op-linux-b01d3fb921df9baef1ecd13704f4b1e269b58b6b.tar.gz blackbird-op-linux-b01d3fb921df9baef1ecd13704f4b1e269b58b6b.zip | |
Merge branch 'for-security' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor into next
Diffstat (limited to 'security/apparmor/domain.c')
| -rw-r--r-- | security/apparmor/domain.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c index c1e18ba5bdc0..7c69599a69e1 100644 --- a/security/apparmor/domain.c +++ b/security/apparmor/domain.c @@ -372,13 +372,12 @@ int apparmor_bprm_set_creds(struct linux_binprm *bprm) state = profile->file.start; /* buffer freed below, name is pointer into buffer */ - error = aa_get_name(&bprm->file->f_path, profile->path_flags, &buffer, - &name); + error = aa_path_name(&bprm->file->f_path, profile->path_flags, &buffer, + &name, &info); if (error) { if (profile->flags & (PFLAG_IX_ON_NAME_ERROR | PFLAG_UNCONFINED)) error = 0; - info = "Exec failed name resolution"; name = bprm->filename; goto audit; } |
