author: Eric W. Biederman <ebiederm@xmission.com> 2015-11-11 17:22:33 -0600
committer: Jeff Layton <jeff.layton@primarydata.com> 2015-11-16 10:01:34 -0500
commit: 95ace75414f312f9a7b93d873f386987b92a5301
parent: 9e8925b67a809bb27ce4b7d352d67f25cf1d7fc5
Commit Summary:
Diffstat:
1 file changed, 1 insertion, 1 deletion
diff --git a/fs/namespace.c b/fs/namespace.c
index 4219885e9681..4d2c8f64b7bf 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1589,7 +1589,7 @@ static inline bool may_mandlock(void)
#ifndef CONFIG_MANDATORY_FILE_LOCKING
return false;
#endif
- return true;
+ return capable(CAP_SYS_ADMIN);
}
/*