Commit c0a3a20b authored by Mike Frysinger's avatar Mike Frysinger Committed by Linus Torvalds

linux/audit.h: move ptrace.h include to kernel header

While the kernel internals want pt_regs (and so it includes
linux/ptrace.h), the user version of audit.h does not need it.  So move
the include out of the uapi version.

This avoids issues where people want the audit defines and userland
ptrace api.  Including both the kernel ptrace and the userland ptrace
headers can easily lead to failure.
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
Cc: Eric Paris <eparis@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 82919919
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#define _LINUX_AUDIT_H_ #define _LINUX_AUDIT_H_
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/ptrace.h>
#include <uapi/linux/audit.h> #include <uapi/linux/audit.h>
struct audit_sig_info { struct audit_sig_info {
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/elf-em.h> #include <linux/elf-em.h>
#include <linux/ptrace.h>
/* The netlink messages for the audit system is divided into blocks: /* The netlink messages for the audit system is divided into blocks:
* 1000 - 1099 are for commanding the audit system * 1000 - 1099 are for commanding the audit system
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment