Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 44672e4fbd40e2dda8bbce7d0f71d24dbfc7e00e

Authored by Nick Piggin
Committed by Al Viro
1 parent baa0389073
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

apparmor: use task path helpers 

apparmor: use task path helpers

Signed-off-by: Nick Piggin <npiggin@kernel.dk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Showing 1 changed file with 2 additions and 7 deletions Side-by-side Diff

security/apparmor/path.c
Diff comments   View file @ 44672e4
... ... @@ -62,19 +62,14 @@
62 62 int deleted, connected;
63 63 int error = 0;
64 64  
65   - /* Get the root we want to resolve too */
  65 + /* Get the root we want to resolve too, released below */
66 66 if (flags & PATH_CHROOT_REL) {
67 67 /* resolve paths relative to chroot */
68   - read_lock(&current->fs->lock);
69   - root = current->fs->root;
70   - /* released below */
71   - path_get(&root);
72   - read_unlock(&current->fs->lock);
  68 + get_fs_root(current->fs, &root);
73 69 } else {
74 70 /* resolve paths relative to namespace */
75 71 root.mnt = current->nsproxy->mnt_ns->root;
76 72 root.dentry = root.mnt->mnt_root;
77   - /* released below */
78 73 path_get(&root);
79 74 }
80 75