diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
| commit | dcec8a13bf565e47942a1751a9cec21bec5648fe (patch) | |
| tree | 548b69625b18cc2e88c3e68d0923be546c9ebb03 /include/linux/binfmts.h | |
| parent | 2e0f55e79c49509b7ff70ff1a10e1e9e90a3dfd4 (diff) | |
o Merge with Linux 2.1.99.
o Fix ancient bug in the ELF loader making ldd crash.
o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.
Diffstat (limited to 'include/linux/binfmts.h')
| -rw-r--r-- | include/linux/binfmts.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h index 1174fc07d..0d34d35ba 100644 --- a/include/linux/binfmts.h +++ b/include/linux/binfmts.h @@ -2,6 +2,7 @@ #define _LINUX_BINFMTS_H #include <linux/ptrace.h> +#include <linux/capability.h> /* * MAX_ARG_PAGES defines the number of pages allocated for arguments @@ -10,6 +11,8 @@ */ #define MAX_ARG_PAGES 32 +#ifdef __KERNEL__ + /* * This structure is used to hold the arguments that are used when loading binaries. */ @@ -21,6 +24,7 @@ struct linux_binprm{ int java; /* Java binary, prevent recursive invocation */ struct dentry * dentry; int e_uid, e_gid; + kernel_cap_t cap_inheritable, cap_permitted, cap_effective; int argc, envc; char * filename; /* Name of binary */ unsigned long loader, exec; @@ -64,7 +68,10 @@ extern unsigned long setup_arg_pages(unsigned long p, struct linux_binprm * bprm extern unsigned long copy_strings(int argc,char ** argv,unsigned long *page, unsigned long p, int from_kmem); +extern void compute_creds(struct linux_binprm *binprm); + /* this eventually goes away */ #define change_ldt(a,b) setup_arg_pages(a,b) -#endif +#endif /* __KERNEL__ */ +#endif /* _LINUX_BINFMTS_H */ |