summaryrefslogtreecommitdiffstats
path: root/fs/namei.c
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-06-21 09:53:06 -0700
committerAl Viro <viro@zeniv.linux.org.uk>2017-06-29 20:08:32 -0400
commitcc658db47d6897a8571fb6227f59d1d18151b0b2 (patch)
tree67d1bd8c5c8f3f7c90a6f24c39832fc0218de07a /fs/namei.c
parent41124db869b7e00e12052555f8987867ac01d70c (diff)
downloadlinux-cc658db47d6897a8571fb6227f59d1d18151b0b2.tar.gz
linux-cc658db47d6897a8571fb6227f59d1d18151b0b2.tar.bz2
linux-cc658db47d6897a8571fb6227f59d1d18151b0b2.zip
fs: Reorder inode_owner_or_capable() to avoid needless
Checking for capabilities should be the last operation when performing access control tests so that PF_SUPERPRIV is set only when it was required for success (implying that the capability was needed for the operation). Reported-by: Solar Designer <solar@openwall.com> Signed-off-by: Kees Cook <keescook@chromium.org> Acked-by: Serge Hallyn <serge@hallyn.com> Reviewed-by: Andy Lutomirski <luto@kernel.org> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/namei.c')
-rw-r--r--fs/namei.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/namei.c b/fs/namei.c
index 6571a5f5112e..efe53a5d0737 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1008,7 +1008,7 @@ static int may_linkat(struct path *link)
/* Source inode owner (or CAP_FOWNER) can hardlink all they like,
* otherwise, it must be a safe source.
*/
- if (inode_owner_or_capable(inode) || safe_hardlink_source(inode))
+ if (safe_hardlink_source(inode) || inode_owner_or_capable(inode))
return 0;
audit_log_link_denied("linkat", link);