diff options
| author | Aleksa Sarai <cyphar@cyphar.com> | 2019-12-07 01:13:28 +1100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2019-12-08 19:09:38 -0500 |
| commit | 1bc82070fa2763bdca626fa8bde72b35f11e8960 (patch) | |
| tree | c64975083207b96e9d763e592d0ac5432c1cc97d /security | |
| parent | ce623f89872df4253719be71531116751eeab85f (diff) | |
| download | linux-1bc82070fa2763bdca626fa8bde72b35f11e8960.tar.gz linux-1bc82070fa2763bdca626fa8bde72b35f11e8960.tar.bz2 linux-1bc82070fa2763bdca626fa8bde72b35f11e8960.zip | |
namei: allow nd_jump_link() to produce errors
In preparation for LOOKUP_NO_MAGICLINKS, it's necessary to add the
ability for nd_jump_link() to return an error which the corresponding
get_link() caller must propogate back up to the VFS.
Suggested-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'security')
| -rw-r--r-- | security/apparmor/apparmorfs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c index 09996f2552ee..7f27ce2a0113 100644 --- a/security/apparmor/apparmorfs.c +++ b/security/apparmor/apparmorfs.c @@ -2573,16 +2573,18 @@ static const char *policy_get_link(struct dentry *dentry, { struct aa_ns *ns; struct path path; + int error; if (!dentry) return ERR_PTR(-ECHILD); + ns = aa_get_current_ns(); path.mnt = mntget(aafs_mnt); path.dentry = dget(ns_dir(ns)); - nd_jump_link(&path); + error = nd_jump_link(&path); aa_put_ns(ns); - return NULL; + return ERR_PTR(error); } static int policy_readlink(struct dentry *dentry, char __user *buffer, |