summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorJohn Johansen <john.johansen@canonical.com>2012-02-16 06:32:47 -0800
committerJohn Johansen <john.johansen@canonical.com>2012-03-14 06:15:23 -0700
commit3372b68a3c982611dcc30b3c872f8bbdee019e5e (patch)
tree6266a00311e1fce559326447e6b65952ca2db4c9 /security
parentfbba8d89acea5d628d1d076b1d8962db438ff832 (diff)
downloadlinux-3.10-3372b68a3c982611dcc30b3c872f8bbdee019e5e.tar.gz
linux-3.10-3372b68a3c982611dcc30b3c872f8bbdee019e5e.tar.bz2
linux-3.10-3372b68a3c982611dcc30b3c872f8bbdee019e5e.zip
AppArmor: Minor cleanup of d_namespace_path to consolidate error handling
Signed-off-by: John Johansen <john.johansen@canonical.com> Acked-by: Kees Cook <kees@ubuntu.com>
Diffstat (limited to 'security')
-rw-r--r--security/apparmor/path.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/security/apparmor/path.c b/security/apparmor/path.c
index 8c90fd0f49c..a7936dfe0e6 100644
--- a/security/apparmor/path.c
+++ b/security/apparmor/path.c
@@ -83,21 +83,18 @@ static int d_namespace_path(struct path *path, char *buf, int buflen,
struct path root;
get_fs_root(current->fs, &root);
res = __d_path(path, &root, buf, buflen);
- if (res && !IS_ERR(res)) {
- /* everything's fine */
- *name = res;
- path_put(&root);
- goto ok;
- }
path_put(&root);
- connected = 0;
- } else
+ } else {
res = d_absolute_path(path, buf, buflen);
+ if (!our_mnt(path->mnt))
+ connected = 0;
+ }
/* handle error conditions - and still allow a partial path to
* be returned.
*/
- if (IS_ERR(res)) {
+ if (!res || IS_ERR(res)) {
+ connected = 0;
res = dentry_path_raw(path->dentry, buf, buflen);
if (IS_ERR(res)) {
error = PTR_ERR(res);
@@ -109,7 +106,6 @@ static int d_namespace_path(struct path *path, char *buf, int buflen,
*name = res;
-ok:
/* Handle two cases:
* 1. A deleted dentry && profile is not allowing mediation of deleted
* 2. On some filesystems, newly allocated dentries appear to the