summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-08-12 21:36:13 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2012-08-12 21:36:13 +0300
commitc8dfbf48d3dd4e96044f2fa04fb5f58239e44c31 (patch)
tree822ae29c1572f7e95fd4726c3effd8389a79b336 /include
parente4e139bebd9cc2c867950ad8ea6814e542dbcc6f (diff)
parent9d8dad742ad1c74d7e7210ee05d0b44961d5ea16 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull a security subsystem fix from James Morris "This fixes an issue in the Yama LSM" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: Yama: higher restrictions should block PTRACE_TRACEME
Diffstat (limited to 'include')
-rw-r--r--include/linux/security.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/security.h b/include/linux/security.h
index 4e5a73cdbbe..3dea6a9d568 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -1242,8 +1242,6 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
* Check that the @parent process has sufficient permission to trace the
* current process before allowing the current process to present itself
* to the @parent process for tracing.
- * The parent process will still have to undergo the ptrace_access_check
- * checks before it is allowed to trace this one.
* @parent contains the task_struct structure for debugger process.
* Return 0 if permission is granted.
* @capget: