diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/capability.h | 1 | ||||
| -rw-r--r-- | include/linux/ptrace.h | 1 | ||||
| -rw-r--r-- | include/linux/sched.h | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/capability.h b/include/linux/capability.h index dbc21c719ce6..d6088e2a7668 100644 --- a/include/linux/capability.h +++ b/include/linux/capability.h | |||
| @@ -242,6 +242,7 @@ static inline bool ns_capable_noaudit(struct user_namespace *ns, int cap) | |||
| 242 | #endif /* CONFIG_MULTIUSER */ | 242 | #endif /* CONFIG_MULTIUSER */ |
| 243 | extern bool capable_wrt_inode_uidgid(const struct inode *inode, int cap); | 243 | extern bool capable_wrt_inode_uidgid(const struct inode *inode, int cap); |
| 244 | extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap); | 244 | extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap); |
| 245 | extern bool ptracer_capable(struct task_struct *tsk, struct user_namespace *ns); | ||
| 245 | 246 | ||
| 246 | /* audit system wants to get cap info from files as well */ | 247 | /* audit system wants to get cap info from files as well */ |
| 247 | extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps); | 248 | extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps); |
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h index 504c98a278d4..e13bfdf7f314 100644 --- a/include/linux/ptrace.h +++ b/include/linux/ptrace.h | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #define PT_SEIZED 0x00010000 /* SEIZE used, enable new behavior */ | 19 | #define PT_SEIZED 0x00010000 /* SEIZE used, enable new behavior */ |
| 20 | #define PT_PTRACED 0x00000001 | 20 | #define PT_PTRACED 0x00000001 |
| 21 | #define PT_DTRACE 0x00000002 /* delayed trace (used on m68k, i386) */ | 21 | #define PT_DTRACE 0x00000002 /* delayed trace (used on m68k, i386) */ |
| 22 | #define PT_PTRACE_CAP 0x00000004 /* ptracer can follow suid-exec */ | ||
| 23 | 22 | ||
| 24 | #define PT_OPT_FLAG_SHIFT 3 | 23 | #define PT_OPT_FLAG_SHIFT 3 |
| 25 | /* PT_TRACE_* event enable flags */ | 24 | /* PT_TRACE_* event enable flags */ |
diff --git a/include/linux/sched.h b/include/linux/sched.h index 348f51b0ec92..e9f693598e15 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -1656,6 +1656,7 @@ struct task_struct { | |||
| 1656 | struct list_head cpu_timers[3]; | 1656 | struct list_head cpu_timers[3]; |
| 1657 | 1657 | ||
| 1658 | /* process credentials */ | 1658 | /* process credentials */ |
| 1659 | const struct cred __rcu *ptracer_cred; /* Tracer's credentials at attach */ | ||
| 1659 | const struct cred __rcu *real_cred; /* objective and real subjective task | 1660 | const struct cred __rcu *real_cred; /* objective and real subjective task |
| 1660 | * credentials (COW) */ | 1661 | * credentials (COW) */ |
| 1661 | const struct cred __rcu *cred; /* effective (overridable) subjective task | 1662 | const struct cred __rcu *cred; /* effective (overridable) subjective task |
