diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-12 14:36:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-12 14:36:13 -0400 |
| commit | c8dfbf48d3dd4e96044f2fa04fb5f58239e44c31 (patch) | |
| tree | 822ae29c1572f7e95fd4726c3effd8389a79b336 /include | |
| parent | e4e139bebd9cc2c867950ad8ea6814e542dbcc6f (diff) | |
| parent | 9d8dad742ad1c74d7e7210ee05d0b44961d5ea16 (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.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index 4e5a73cdbbef..3dea6a9d568f 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) | |||
| 1242 | * Check that the @parent process has sufficient permission to trace the | 1242 | * Check that the @parent process has sufficient permission to trace the |
| 1243 | * current process before allowing the current process to present itself | 1243 | * current process before allowing the current process to present itself |
| 1244 | * to the @parent process for tracing. | 1244 | * to the @parent process for tracing. |
| 1245 | * The parent process will still have to undergo the ptrace_access_check | ||
| 1246 | * checks before it is allowed to trace this one. | ||
| 1247 | * @parent contains the task_struct structure for debugger process. | 1245 | * @parent contains the task_struct structure for debugger process. |
| 1248 | * Return 0 if permission is granted. | 1246 | * Return 0 if permission is granted. |
| 1249 | * @capget: | 1247 | * @capget: |