History

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

Linus Torvalds committed 14 years ago

Commit c8dfbf42 parents e4e139b 9d8dad73 files · +48 −9Browse files

Showing the changes to include/linux (1 of 3 files). Show all

Unified · Split

include/linux/security.h+0−2
@@ -1242,8 +1242,6 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) · 1241 unmodified lines
12421242 * Check that the @parent process has sufficient permission to trace the
12431243 * current process before allowing the current process to present itself
12441244 * 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.
12471245 * @parent contains the task_struct structure for debugger process.
12481246 * Return 0 if permission is granted.
12491247 * @capget: