diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2002-07-19 02:01:00 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2002-07-19 02:01:00 -0700 |
| commit | 1c0fe622c8847e1caab384a81cf96de2f1ac05d8 (patch) | |
| tree | ea83fc894fbd386dba63ddeac33c7be5a729978d /include/linux | |
| parent | 2b15fe6334aebd7d3340f8b826acb79b138afa74 (diff) | |
LSM: Enable the security framework. This includes basic task control hooks.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/binfmts.h | 1 | ||||
| -rw-r--r-- | include/linux/sched.h | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h index fe17499f6144..314addb2329d 100644 --- a/include/linux/binfmts.h +++ b/include/linux/binfmts.h @@ -28,6 +28,7 @@ struct linux_binprm{ struct file * file; int e_uid, e_gid; kernel_cap_t cap_inheritable, cap_permitted, cap_effective; + void *security; int argc, envc; char * filename; /* Name of binary */ unsigned long loader, exec; diff --git a/include/linux/sched.h b/include/linux/sched.h index 2e38ae05d9d2..1d288587e44d 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -354,6 +354,8 @@ struct task_struct { void *notifier_data; sigset_t *notifier_mask; + void *security; + /* Thread group tracking */ u32 parent_exec_id; u32 self_exec_id; @@ -587,10 +589,9 @@ extern int request_irq(unsigned int, unsigned long, const char *, void *); extern void free_irq(unsigned int, void *); -/* - * capable() checks for a particular capability. - * See include/linux/capability.h for defined capabilities. - */ +/* capable prototype and code moved to security.[hc] */ +#include <linux/security.h> +#if 0 static inline int capable(int cap) { if (cap_raised(current->cap_effective, cap)) { @@ -599,6 +600,7 @@ static inline int capable(int cap) } return 0; } +#endif /* if 0 */ /* * Routines for handling mm_structs |