移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/include/linux/binfmts.h
..
..
@@ -15,7 +15,6 @@
15
15
  * This structure is used to hold the arguments that are used when loading binaries.
16
16
  */
17
17
 struct linux_binprm {
18
-	char buf[BINPRM_BUF_SIZE];
19
18
 #ifdef CONFIG_MMU
20
19
 	struct vm_area_struct *vma;
21
20
 	unsigned long vma_pages;
..
..
@@ -25,52 +24,50 @@
25
24
 #endif
26
25
 	struct mm_struct *mm;
27
26
 	unsigned long p; /* current top of mem */
27
+	unsigned long argmin; /* rlimit marker for copy_strings() */
28
28
 	unsigned int
29
+		/* Should an execfd be passed to userspace? */
30
+		have_execfd:1,
31
+
32
+		/* Use the creds of a script (see binfmt_misc) */
33
+		execfd_creds:1,
29
34
 		/*
30
-		 * True after the bprm_set_creds hook has been called once
31
-		 * (multiple calls can be made via prepare_binprm() for
32
-		 * binfmt_script/misc).
35
+		 * Set by bprm_creds_for_exec hook to indicate a
36
+		 * privilege-gaining exec has happened. Used to set
37
+		 * AT_SECURE auxv for glibc.
33
38
 		 */
34
-		called_set_creds:1,
39
+		secureexec:1,
35
40
 		/*
36
-		 * True if most recent call to the commoncaps bprm_set_creds
37
-		 * hook (due to multiple prepare_binprm() calls from the
38
-		 * binfmt_script/misc handlers) resulted in elevated
39
-		 * privileges.
41
+		 * Set when errors can no longer be returned to the
42
+		 * original userspace.
40
43
 		 */
41
-		cap_elevated:1,
42
-		/*
43
-		 * Set by bprm_set_creds hook to indicate a privilege-gaining
44
-		 * exec has happened. Used to sanitize execution environment
45
-		 * and to set AT_SECURE auxv for glibc.
46
-		 */
47
-		secureexec:1;
44
+		point_of_no_return:1;
48
45
 #ifdef __alpha__
49
46
 	unsigned int taso:1;
50
47
 #endif
51
-	unsigned int recursion_depth; /* only for search_binary_handler() */
52
-	struct file * file;
48
+	struct file *executable; /* Executable to pass to the interpreter */
49
+	struct file *interpreter;
50
+	struct file *file;
53
51
 	struct cred *cred;	/* new credentials */
54
52
 	int unsafe;		/* how unsafe this exec is (mask of LSM_UNSAFE_*) */
55
53
 	unsigned int per_clear;	/* bits to clear in current->personality */
56
54
 	int argc, envc;
57
-	const char * filename;	/* Name of binary as seen by procps */
58
-	const char * interp;	/* Name of the binary really executed. Most
55
+	const char *filename;	/* Name of binary as seen by procps */
56
+	const char *interp;	/* Name of the binary really executed. Most
59
57
 				   of the time same as filename, but could be
60
58
 				   different for binfmt_{misc,script} */
59
+	const char *fdpath;	/* generated filename for execveat */
61
60
 	unsigned interp_flags;
62
-	unsigned interp_data;
61
+	int execfd;		/* File descriptor of the executable */
63
62
 	unsigned long loader, exec;
64
63
 
65
64
 	struct rlimit rlim_stack; /* Saved RLIMIT_STACK used during exec. */
65
+
66
+	char buf[BINPRM_BUF_SIZE];
66
67
 } __randomize_layout;
67
68
 
68
69
 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
69
70
 #define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT)
70
-
71
-/* fd of the binary should be passed to the interpreter */
72
-#define BINPRM_FLAGS_EXECFD_BIT 1
73
-#define BINPRM_FLAGS_EXECFD (1 << BINPRM_FLAGS_EXECFD_BIT)
74
71
 
75
72
 /* filename of the binary will be inaccessible after exec */
76
73
 #define BINPRM_FLAGS_PATH_INACCESSIBLE_BIT 2
..
..
@@ -78,7 +75,7 @@
78
75
 
79
76
 /* Function parameter for binfmt->coredump */
80
77
 struct coredump_params {
81
-	const siginfo_t *siginfo;
78
+	const kernel_siginfo_t *siginfo;
82
79
 	struct pt_regs *regs;
83
80
 	struct file *file;
84
81
 	unsigned long limit;
..
..
@@ -115,10 +112,8 @@
115
112
 
116
113
 extern void unregister_binfmt(struct linux_binfmt *);
117
114
 
118
-extern int prepare_binprm(struct linux_binprm *);
119
115
 extern int __must_check remove_arg_zero(struct linux_binprm *);
120
-extern int search_binary_handler(struct linux_binprm *);
121
-extern int flush_old_exec(struct linux_binprm * bprm);
116
+extern int begin_new_exec(struct linux_binprm * bprm);
122
117
 extern void setup_new_exec(struct linux_binprm * bprm);
123
118
 extern void finalize_exec(struct linux_binprm *bprm);
124
119
 extern void would_dump(struct linux_binprm *, struct file *);
..
..
@@ -136,20 +131,11 @@
136
131
 extern int transfer_args_to_stack(struct linux_binprm *bprm,
137
132
 				  unsigned long *sp_location);
138
133
 extern int bprm_change_interp(const char *interp, struct linux_binprm *bprm);
139
-extern int copy_strings_kernel(int argc, const char *const *argv,
140
-			       struct linux_binprm *bprm);
141
-extern int prepare_bprm_creds(struct linux_binprm *bprm);
142
-extern void install_exec_creds(struct linux_binprm *bprm);
134
+int copy_string_kernel(const char *arg, struct linux_binprm *bprm);
143
135
 extern void set_binfmt(struct linux_binfmt *new);
144
136
 extern ssize_t read_code(struct file *, unsigned long, loff_t, size_t);
145
137
 
146
-extern int do_execve(struct filename *,
147
-		     const char __user * const __user *,
148
-		     const char __user * const __user *);
149
-extern int do_execveat(int, struct filename *,
150
-		       const char __user * const __user *,
151
-		       const char __user * const __user *,
152
-		       int);
153
-int do_execve_file(struct file *file, void *__argv, void *__envp);
138
+int kernel_execve(const char *filename,
139
+		  const char *const *argv, const char *const *envp);
154
140
 
155
141
 #endif /* _LINUX_BINFMTS_H */