dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

AppArmor: Retrieve the dentry_path for error reporting when path lookup fails 

When __d_path and d_absolute_path fail due to the name being outside of
the current namespace no name is reported.  Use dentry_path to provide
some hint as to which file was being accessed.

Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Kees Cook <kees@ubuntu.com>
This commit is contained in:
John Johansen 2012-02-16 06:28:50 -08:00
parent 33e521acff
commit fbba8d89ac
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
security/apparmor/path.c
View File

@ -94,18 +94,21 @@ static int d_namespace_path(struct path *path, char *buf, int buflen,
} else } else
res = d_absolute_path(path, buf, buflen); res = d_absolute_path(path, buf, buflen);
*name = res;
/* handle error conditions - and still allow a partial path to /* handle error conditions - and still allow a partial path to
* be returned. * be returned.
*/ */
if (IS_ERR(res)) { if (IS_ERR(res)) {
error = PTR_ERR(res); res = dentry_path_raw(path->dentry, buf, buflen);
*name = buf; if (IS_ERR(res)) {
goto out; error = PTR_ERR(res);
} *name = buf;
if (!our_mnt(path->mnt)) goto out;
};
} else if (!our_mnt(path->mnt))
connected = 0; connected = 0;
*name = res;
ok: ok:
/* Handle two cases: /* Handle two cases:
* 1. A deleted dentry && profile is not allowing mediation of deleted * 1. A deleted dentry && profile is not allowing mediation of deleted