1 // SPDX-License-Identifier: GPL-2.0-or-later <<
2 /* binfmt_elf_fdpic.c: FDPIC ELF binary format 1 /* binfmt_elf_fdpic.c: FDPIC ELF binary format
3 * 2 *
4 * Copyright (C) 2003, 2004, 2006 Red Hat, Inc 3 * Copyright (C) 2003, 2004, 2006 Red Hat, Inc. All Rights Reserved.
5 * Written by David Howells (dhowells@redhat.c 4 * Written by David Howells (dhowells@redhat.com)
6 * Derived from binfmt_elf.c 5 * Derived from binfmt_elf.c
>> 6 *
>> 7 * This program is free software; you can redistribute it and/or
>> 8 * modify it under the terms of the GNU General Public License
>> 9 * as published by the Free Software Foundation; either version
>> 10 * 2 of the License, or (at your option) any later version.
7 */ 11 */
8 12
9 #include <linux/module.h> 13 #include <linux/module.h>
10 14
11 #include <linux/fs.h> 15 #include <linux/fs.h>
12 #include <linux/stat.h> 16 #include <linux/stat.h>
13 #include <linux/sched.h> 17 #include <linux/sched.h>
14 #include <linux/sched/coredump.h> <<
15 #include <linux/sched/task_stack.h> <<
16 #include <linux/sched/cputime.h> <<
17 #include <linux/mm.h> 18 #include <linux/mm.h>
18 #include <linux/mman.h> 19 #include <linux/mman.h>
19 #include <linux/errno.h> 20 #include <linux/errno.h>
20 #include <linux/signal.h> 21 #include <linux/signal.h>
21 #include <linux/binfmts.h> 22 #include <linux/binfmts.h>
22 #include <linux/string.h> 23 #include <linux/string.h>
23 #include <linux/file.h> 24 #include <linux/file.h>
24 #include <linux/fcntl.h> 25 #include <linux/fcntl.h>
25 #include <linux/slab.h> 26 #include <linux/slab.h>
26 #include <linux/pagemap.h> 27 #include <linux/pagemap.h>
27 #include <linux/security.h> 28 #include <linux/security.h>
28 #include <linux/highmem.h> 29 #include <linux/highmem.h>
29 #include <linux/highuid.h> 30 #include <linux/highuid.h>
30 #include <linux/personality.h> 31 #include <linux/personality.h>
31 #include <linux/ptrace.h> 32 #include <linux/ptrace.h>
32 #include <linux/init.h> 33 #include <linux/init.h>
33 #include <linux/elf.h> 34 #include <linux/elf.h>
34 #include <linux/elf-fdpic.h> 35 #include <linux/elf-fdpic.h>
35 #include <linux/elfcore.h> 36 #include <linux/elfcore.h>
36 #include <linux/coredump.h> 37 #include <linux/coredump.h>
37 #include <linux/dax.h> 38 #include <linux/dax.h>
38 #include <linux/regset.h> <<
39 39
40 #include <linux/uaccess.h> !! 40 #include <asm/uaccess.h>
41 #include <asm/param.h> 41 #include <asm/param.h>
>> 42 #include <asm/pgalloc.h>
42 43
43 typedef char *elf_caddr_t; 44 typedef char *elf_caddr_t;
44 45
45 #if 0 46 #if 0
46 #define kdebug(fmt, ...) printk("FDPIC "fmt"\n 47 #define kdebug(fmt, ...) printk("FDPIC "fmt"\n" ,##__VA_ARGS__ )
47 #else 48 #else
48 #define kdebug(fmt, ...) do {} while(0) 49 #define kdebug(fmt, ...) do {} while(0)
49 #endif 50 #endif
50 51
51 #if 0 52 #if 0
52 #define kdcore(fmt, ...) printk("FDPIC "fmt"\n 53 #define kdcore(fmt, ...) printk("FDPIC "fmt"\n" ,##__VA_ARGS__ )
53 #else 54 #else
54 #define kdcore(fmt, ...) do {} while(0) 55 #define kdcore(fmt, ...) do {} while(0)
55 #endif 56 #endif
56 57
57 MODULE_LICENSE("GPL"); 58 MODULE_LICENSE("GPL");
58 59
59 static int load_elf_fdpic_binary(struct linux_ 60 static int load_elf_fdpic_binary(struct linux_binprm *);
60 static int elf_fdpic_fetch_phdrs(struct elf_fd 61 static int elf_fdpic_fetch_phdrs(struct elf_fdpic_params *, struct file *);
61 static int elf_fdpic_map_file(struct elf_fdpic 62 static int elf_fdpic_map_file(struct elf_fdpic_params *, struct file *,
62 struct mm_struct 63 struct mm_struct *, const char *);
63 64
64 static int create_elf_fdpic_tables(struct linu 65 static int create_elf_fdpic_tables(struct linux_binprm *, struct mm_struct *,
65 struct elf_ 66 struct elf_fdpic_params *,
66 struct elf_ 67 struct elf_fdpic_params *);
67 68
68 #ifndef CONFIG_MMU 69 #ifndef CONFIG_MMU
>> 70 static int elf_fdpic_transfer_args_to_stack(struct linux_binprm *,
>> 71 unsigned long *);
69 static int elf_fdpic_map_file_constdisp_on_ucl 72 static int elf_fdpic_map_file_constdisp_on_uclinux(struct elf_fdpic_params *,
70 73 struct file *,
71 74 struct mm_struct *);
72 #endif 75 #endif
73 76
74 static int elf_fdpic_map_file_by_direct_mmap(s 77 static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *,
75 s 78 struct file *, struct mm_struct *);
76 79
77 #ifdef CONFIG_ELF_CORE 80 #ifdef CONFIG_ELF_CORE
78 static int elf_fdpic_core_dump(struct coredump 81 static int elf_fdpic_core_dump(struct coredump_params *cprm);
79 #endif 82 #endif
80 83
81 static struct linux_binfmt elf_fdpic_format = 84 static struct linux_binfmt elf_fdpic_format = {
82 .module = THIS_MODULE, 85 .module = THIS_MODULE,
83 .load_binary = load_elf_fdpic_binar 86 .load_binary = load_elf_fdpic_binary,
84 #ifdef CONFIG_ELF_CORE 87 #ifdef CONFIG_ELF_CORE
85 .core_dump = elf_fdpic_core_dump, 88 .core_dump = elf_fdpic_core_dump,
86 .min_coredump = ELF_EXEC_PAGESIZE, <<
87 #endif 89 #endif
>> 90 .min_coredump = ELF_EXEC_PAGESIZE,
88 }; 91 };
89 92
90 static int __init init_elf_fdpic_binfmt(void) 93 static int __init init_elf_fdpic_binfmt(void)
91 { 94 {
92 register_binfmt(&elf_fdpic_format); 95 register_binfmt(&elf_fdpic_format);
93 return 0; 96 return 0;
94 } 97 }
95 98
96 static void __exit exit_elf_fdpic_binfmt(void) 99 static void __exit exit_elf_fdpic_binfmt(void)
97 { 100 {
98 unregister_binfmt(&elf_fdpic_format); 101 unregister_binfmt(&elf_fdpic_format);
99 } 102 }
100 103
101 core_initcall(init_elf_fdpic_binfmt); 104 core_initcall(init_elf_fdpic_binfmt);
102 module_exit(exit_elf_fdpic_binfmt); 105 module_exit(exit_elf_fdpic_binfmt);
103 106
104 static int is_elf(struct elfhdr *hdr, struct f 107 static int is_elf(struct elfhdr *hdr, struct file *file)
105 { 108 {
106 if (memcmp(hdr->e_ident, ELFMAG, SELFM 109 if (memcmp(hdr->e_ident, ELFMAG, SELFMAG) != 0)
107 return 0; 110 return 0;
108 if (hdr->e_type != ET_EXEC && hdr->e_t 111 if (hdr->e_type != ET_EXEC && hdr->e_type != ET_DYN)
109 return 0; 112 return 0;
110 if (!elf_check_arch(hdr)) 113 if (!elf_check_arch(hdr))
111 return 0; 114 return 0;
112 if (!file->f_op->mmap) 115 if (!file->f_op->mmap)
113 return 0; 116 return 0;
114 return 1; 117 return 1;
115 } 118 }
116 119
117 #ifndef elf_check_fdpic 120 #ifndef elf_check_fdpic
118 #define elf_check_fdpic(x) 0 121 #define elf_check_fdpic(x) 0
119 #endif 122 #endif
120 123
121 #ifndef elf_check_const_displacement 124 #ifndef elf_check_const_displacement
122 #define elf_check_const_displacement(x) 0 125 #define elf_check_const_displacement(x) 0
123 #endif 126 #endif
124 127
125 static int is_constdisp(struct elfhdr *hdr) 128 static int is_constdisp(struct elfhdr *hdr)
126 { 129 {
127 if (!elf_check_fdpic(hdr)) 130 if (!elf_check_fdpic(hdr))
128 return 1; 131 return 1;
129 if (elf_check_const_displacement(hdr)) 132 if (elf_check_const_displacement(hdr))
130 return 1; 133 return 1;
131 return 0; 134 return 0;
132 } 135 }
133 136
134 /********************************************* 137 /*****************************************************************************/
135 /* 138 /*
136 * read the program headers table into memory 139 * read the program headers table into memory
137 */ 140 */
138 static int elf_fdpic_fetch_phdrs(struct elf_fd 141 static int elf_fdpic_fetch_phdrs(struct elf_fdpic_params *params,
139 struct file * 142 struct file *file)
140 { 143 {
141 struct elf_phdr *phdr; !! 144 struct elf32_phdr *phdr;
142 unsigned long size; 145 unsigned long size;
143 int retval, loop; 146 int retval, loop;
144 loff_t pos = params->hdr.e_phoff; <<
145 147
146 if (params->hdr.e_phentsize != sizeof( 148 if (params->hdr.e_phentsize != sizeof(struct elf_phdr))
147 return -ENOMEM; 149 return -ENOMEM;
148 if (params->hdr.e_phnum > 65536U / siz 150 if (params->hdr.e_phnum > 65536U / sizeof(struct elf_phdr))
149 return -ENOMEM; 151 return -ENOMEM;
150 152
151 size = params->hdr.e_phnum * sizeof(st 153 size = params->hdr.e_phnum * sizeof(struct elf_phdr);
152 params->phdrs = kmalloc(size, GFP_KERN 154 params->phdrs = kmalloc(size, GFP_KERNEL);
153 if (!params->phdrs) 155 if (!params->phdrs)
154 return -ENOMEM; 156 return -ENOMEM;
155 157
156 retval = kernel_read(file, params->phd !! 158 retval = kernel_read(file, params->hdr.e_phoff,
>> 159 (char *) params->phdrs, size);
157 if (unlikely(retval != size)) 160 if (unlikely(retval != size))
158 return retval < 0 ? retval : - 161 return retval < 0 ? retval : -ENOEXEC;
159 162
160 /* determine stack size for this binar 163 /* determine stack size for this binary */
161 phdr = params->phdrs; 164 phdr = params->phdrs;
162 for (loop = 0; loop < params->hdr.e_ph 165 for (loop = 0; loop < params->hdr.e_phnum; loop++, phdr++) {
163 if (phdr->p_type != PT_GNU_STA 166 if (phdr->p_type != PT_GNU_STACK)
164 continue; 167 continue;
165 168
166 if (phdr->p_flags & PF_X) 169 if (phdr->p_flags & PF_X)
167 params->flags |= ELF_F 170 params->flags |= ELF_FDPIC_FLAG_EXEC_STACK;
168 else 171 else
169 params->flags |= ELF_F 172 params->flags |= ELF_FDPIC_FLAG_NOEXEC_STACK;
170 173
171 params->stack_size = phdr->p_m 174 params->stack_size = phdr->p_memsz;
172 break; 175 break;
173 } 176 }
174 177
175 return 0; 178 return 0;
176 } 179 }
177 180
178 /********************************************* 181 /*****************************************************************************/
179 /* 182 /*
180 * load an fdpic binary into various bits of m 183 * load an fdpic binary into various bits of memory
181 */ 184 */
182 static int load_elf_fdpic_binary(struct linux_ 185 static int load_elf_fdpic_binary(struct linux_binprm *bprm)
183 { 186 {
184 struct elf_fdpic_params exec_params, i 187 struct elf_fdpic_params exec_params, interp_params;
185 struct pt_regs *regs = current_pt_regs 188 struct pt_regs *regs = current_pt_regs();
186 struct elf_phdr *phdr; 189 struct elf_phdr *phdr;
187 unsigned long stack_size, entryaddr; 190 unsigned long stack_size, entryaddr;
188 #ifdef ELF_FDPIC_PLAT_INIT 191 #ifdef ELF_FDPIC_PLAT_INIT
189 unsigned long dynaddr; 192 unsigned long dynaddr;
190 #endif 193 #endif
191 #ifndef CONFIG_MMU 194 #ifndef CONFIG_MMU
192 unsigned long stack_prot; 195 unsigned long stack_prot;
193 #endif 196 #endif
194 struct file *interpreter = NULL; /* to 197 struct file *interpreter = NULL; /* to shut gcc up */
195 char *interpreter_name = NULL; 198 char *interpreter_name = NULL;
196 int executable_stack; 199 int executable_stack;
197 int retval, i; 200 int retval, i;
198 loff_t pos; <<
199 201
200 kdebug("____ LOAD %d ____", current->p 202 kdebug("____ LOAD %d ____", current->pid);
201 203
202 memset(&exec_params, 0, sizeof(exec_pa 204 memset(&exec_params, 0, sizeof(exec_params));
203 memset(&interp_params, 0, sizeof(inter 205 memset(&interp_params, 0, sizeof(interp_params));
204 206
205 exec_params.hdr = *(struct elfhdr *) b 207 exec_params.hdr = *(struct elfhdr *) bprm->buf;
206 exec_params.flags = ELF_FDPIC_FLAG_PRE 208 exec_params.flags = ELF_FDPIC_FLAG_PRESENT | ELF_FDPIC_FLAG_EXECUTABLE;
207 209
208 /* check that this is a binary we know 210 /* check that this is a binary we know how to deal with */
209 retval = -ENOEXEC; 211 retval = -ENOEXEC;
210 if (!is_elf(&exec_params.hdr, bprm->fi 212 if (!is_elf(&exec_params.hdr, bprm->file))
211 goto error; 213 goto error;
212 if (!elf_check_fdpic(&exec_params.hdr) 214 if (!elf_check_fdpic(&exec_params.hdr)) {
213 #ifdef CONFIG_MMU 215 #ifdef CONFIG_MMU
214 /* binfmt_elf handles non-fdpi 216 /* binfmt_elf handles non-fdpic elf except on nommu */
215 goto error; 217 goto error;
216 #else 218 #else
217 /* nommu can only load ET_DYN 219 /* nommu can only load ET_DYN (PIE) ELF */
218 if (exec_params.hdr.e_type != 220 if (exec_params.hdr.e_type != ET_DYN)
219 goto error; 221 goto error;
220 #endif 222 #endif
221 } 223 }
222 224
223 /* read the program header table */ 225 /* read the program header table */
224 retval = elf_fdpic_fetch_phdrs(&exec_p 226 retval = elf_fdpic_fetch_phdrs(&exec_params, bprm->file);
225 if (retval < 0) 227 if (retval < 0)
226 goto error; 228 goto error;
227 229
228 /* scan for a program header that spec 230 /* scan for a program header that specifies an interpreter */
229 phdr = exec_params.phdrs; 231 phdr = exec_params.phdrs;
230 232
231 for (i = 0; i < exec_params.hdr.e_phnu 233 for (i = 0; i < exec_params.hdr.e_phnum; i++, phdr++) {
232 switch (phdr->p_type) { 234 switch (phdr->p_type) {
233 case PT_INTERP: 235 case PT_INTERP:
234 retval = -ENOMEM; 236 retval = -ENOMEM;
235 if (phdr->p_filesz > P 237 if (phdr->p_filesz > PATH_MAX)
236 goto error; 238 goto error;
237 retval = -ENOENT; 239 retval = -ENOENT;
238 if (phdr->p_filesz < 2 240 if (phdr->p_filesz < 2)
239 goto error; 241 goto error;
240 242
241 /* read the name of th 243 /* read the name of the interpreter into memory */
242 interpreter_name = kma 244 interpreter_name = kmalloc(phdr->p_filesz, GFP_KERNEL);
243 if (!interpreter_name) 245 if (!interpreter_name)
244 goto error; 246 goto error;
245 247
246 pos = phdr->p_offset; !! 248 retval = kernel_read(bprm->file,
247 retval = kernel_read(b !! 249 phdr->p_offset,
248 p !! 250 interpreter_name,
>> 251 phdr->p_filesz);
249 if (unlikely(retval != 252 if (unlikely(retval != phdr->p_filesz)) {
250 if (retval >= 253 if (retval >= 0)
251 retval 254 retval = -ENOEXEC;
252 goto error; 255 goto error;
253 } 256 }
254 257
255 retval = -ENOENT; 258 retval = -ENOENT;
256 if (interpreter_name[p 259 if (interpreter_name[phdr->p_filesz - 1] != '\0')
257 goto error; 260 goto error;
258 261
259 kdebug("Using ELF inte 262 kdebug("Using ELF interpreter %s", interpreter_name);
260 263
261 /* replace the program 264 /* replace the program with the interpreter */
262 interpreter = open_exe 265 interpreter = open_exec(interpreter_name);
263 retval = PTR_ERR(inter 266 retval = PTR_ERR(interpreter);
264 if (IS_ERR(interpreter 267 if (IS_ERR(interpreter)) {
265 interpreter = 268 interpreter = NULL;
266 goto error; 269 goto error;
267 } 270 }
268 271
269 /* 272 /*
270 * If the binary is no 273 * If the binary is not readable then enforce
271 * mm->dumpable = 0 re 274 * mm->dumpable = 0 regardless of the interpreter's
272 * permissions. 275 * permissions.
273 */ 276 */
274 would_dump(bprm, inter 277 would_dump(bprm, interpreter);
275 278
276 pos = 0; !! 279 retval = kernel_read(interpreter, 0, bprm->buf,
277 retval = kernel_read(i !! 280 BINPRM_BUF_SIZE);
278 BINPRM <<
279 if (unlikely(retval != 281 if (unlikely(retval != BINPRM_BUF_SIZE)) {
280 if (retval >= 282 if (retval >= 0)
281 retval 283 retval = -ENOEXEC;
282 goto error; 284 goto error;
283 } 285 }
284 286
285 interp_params.hdr = *( 287 interp_params.hdr = *((struct elfhdr *) bprm->buf);
286 break; 288 break;
287 289
288 case PT_LOAD: 290 case PT_LOAD:
289 #ifdef CONFIG_MMU 291 #ifdef CONFIG_MMU
290 if (exec_params.load_a 292 if (exec_params.load_addr == 0)
291 exec_params.lo 293 exec_params.load_addr = phdr->p_vaddr;
292 #endif 294 #endif
293 break; 295 break;
294 } 296 }
295 297
296 } 298 }
297 299
298 if (is_constdisp(&exec_params.hdr)) 300 if (is_constdisp(&exec_params.hdr))
299 exec_params.flags |= ELF_FDPIC 301 exec_params.flags |= ELF_FDPIC_FLAG_CONSTDISP;
300 302
301 /* perform insanity checks on the inte 303 /* perform insanity checks on the interpreter */
302 if (interpreter_name) { 304 if (interpreter_name) {
303 retval = -ELIBBAD; 305 retval = -ELIBBAD;
304 if (!is_elf(&interp_params.hdr 306 if (!is_elf(&interp_params.hdr, interpreter))
305 goto error; 307 goto error;
306 308
307 interp_params.flags = ELF_FDPI 309 interp_params.flags = ELF_FDPIC_FLAG_PRESENT;
308 310
309 /* read the interpreter's prog 311 /* read the interpreter's program header table */
310 retval = elf_fdpic_fetch_phdrs 312 retval = elf_fdpic_fetch_phdrs(&interp_params, interpreter);
311 if (retval < 0) 313 if (retval < 0)
312 goto error; 314 goto error;
313 } 315 }
314 316
315 stack_size = exec_params.stack_size; 317 stack_size = exec_params.stack_size;
316 if (exec_params.flags & ELF_FDPIC_FLAG 318 if (exec_params.flags & ELF_FDPIC_FLAG_EXEC_STACK)
317 executable_stack = EXSTACK_ENA 319 executable_stack = EXSTACK_ENABLE_X;
318 else if (exec_params.flags & ELF_FDPIC 320 else if (exec_params.flags & ELF_FDPIC_FLAG_NOEXEC_STACK)
319 executable_stack = EXSTACK_DIS 321 executable_stack = EXSTACK_DISABLE_X;
320 else 322 else
321 executable_stack = EXSTACK_DEF 323 executable_stack = EXSTACK_DEFAULT;
322 324
323 if (stack_size == 0 && interp_params.f !! 325 if (stack_size == 0) {
324 stack_size = interp_params.sta 326 stack_size = interp_params.stack_size;
325 if (interp_params.flags & ELF_ 327 if (interp_params.flags & ELF_FDPIC_FLAG_EXEC_STACK)
326 executable_stack = EXS 328 executable_stack = EXSTACK_ENABLE_X;
327 else if (interp_params.flags & 329 else if (interp_params.flags & ELF_FDPIC_FLAG_NOEXEC_STACK)
328 executable_stack = EXS 330 executable_stack = EXSTACK_DISABLE_X;
329 else 331 else
330 executable_stack = EXS 332 executable_stack = EXSTACK_DEFAULT;
331 } 333 }
332 334
333 retval = -ENOEXEC; 335 retval = -ENOEXEC;
334 if (stack_size == 0) 336 if (stack_size == 0)
335 stack_size = 131072UL; /* same 337 stack_size = 131072UL; /* same as exec.c's default commit */
336 338
337 if (is_constdisp(&interp_params.hdr)) 339 if (is_constdisp(&interp_params.hdr))
338 interp_params.flags |= ELF_FDP 340 interp_params.flags |= ELF_FDPIC_FLAG_CONSTDISP;
339 341
340 /* flush all traces of the currently r 342 /* flush all traces of the currently running executable */
341 retval = begin_new_exec(bprm); !! 343 retval = flush_old_exec(bprm);
342 if (retval) 344 if (retval)
343 goto error; 345 goto error;
344 346
345 /* there's now no turning back... the 347 /* there's now no turning back... the old userspace image is dead,
346 * defunct, deceased, etc. 348 * defunct, deceased, etc.
347 */ 349 */
348 SET_PERSONALITY(exec_params.hdr); <<
349 if (elf_check_fdpic(&exec_params.hdr)) 350 if (elf_check_fdpic(&exec_params.hdr))
350 current->personality |= PER_LI !! 351 set_personality(PER_LINUX_FDPIC);
>> 352 else
>> 353 set_personality(PER_LINUX);
351 if (elf_read_implies_exec(&exec_params 354 if (elf_read_implies_exec(&exec_params.hdr, executable_stack))
352 current->personality |= READ_I 355 current->personality |= READ_IMPLIES_EXEC;
353 356
354 setup_new_exec(bprm); 357 setup_new_exec(bprm);
355 358
356 set_binfmt(&elf_fdpic_format); 359 set_binfmt(&elf_fdpic_format);
357 360
358 current->mm->start_code = 0; 361 current->mm->start_code = 0;
359 current->mm->end_code = 0; 362 current->mm->end_code = 0;
360 current->mm->start_stack = 0; 363 current->mm->start_stack = 0;
361 current->mm->start_data = 0; 364 current->mm->start_data = 0;
362 current->mm->end_data = 0; 365 current->mm->end_data = 0;
363 current->mm->context.exec_fdpic_loadma 366 current->mm->context.exec_fdpic_loadmap = 0;
364 current->mm->context.interp_fdpic_load 367 current->mm->context.interp_fdpic_loadmap = 0;
365 368
366 #ifdef CONFIG_MMU 369 #ifdef CONFIG_MMU
367 elf_fdpic_arch_lay_out_mm(&exec_params 370 elf_fdpic_arch_lay_out_mm(&exec_params,
368 &interp_para 371 &interp_params,
369 ¤t->mm 372 ¤t->mm->start_stack,
370 ¤t->mm 373 ¤t->mm->start_brk);
371 374
372 retval = setup_arg_pages(bprm, current 375 retval = setup_arg_pages(bprm, current->mm->start_stack,
373 executable_st 376 executable_stack);
374 if (retval < 0) 377 if (retval < 0)
375 goto error; 378 goto error;
376 #ifdef ARCH_HAS_SETUP_ADDITIONAL_PAGES <<
377 retval = arch_setup_additional_pages(b <<
378 if (retval < 0) <<
379 goto error; <<
380 #endif <<
381 #endif 379 #endif
382 380
383 /* load the executable and interpreter 381 /* load the executable and interpreter into memory */
384 retval = elf_fdpic_map_file(&exec_para 382 retval = elf_fdpic_map_file(&exec_params, bprm->file, current->mm,
385 "executabl 383 "executable");
386 if (retval < 0) 384 if (retval < 0)
387 goto error; 385 goto error;
388 386
389 if (interpreter_name) { 387 if (interpreter_name) {
390 retval = elf_fdpic_map_file(&i 388 retval = elf_fdpic_map_file(&interp_params, interpreter,
391 cu 389 current->mm, "interpreter");
392 if (retval < 0) { 390 if (retval < 0) {
393 printk(KERN_ERR "Unabl 391 printk(KERN_ERR "Unable to load interpreter\n");
394 goto error; 392 goto error;
395 } 393 }
396 394
>> 395 allow_write_access(interpreter);
397 fput(interpreter); 396 fput(interpreter);
398 interpreter = NULL; 397 interpreter = NULL;
399 } 398 }
400 399
401 #ifdef CONFIG_MMU 400 #ifdef CONFIG_MMU
402 if (!current->mm->start_brk) 401 if (!current->mm->start_brk)
403 current->mm->start_brk = curre 402 current->mm->start_brk = current->mm->end_data;
404 403
405 current->mm->brk = current->mm->start_ 404 current->mm->brk = current->mm->start_brk =
406 PAGE_ALIGN(current->mm->start_ 405 PAGE_ALIGN(current->mm->start_brk);
407 406
408 #else 407 #else
409 /* create a stack area and zero-size b 408 /* create a stack area and zero-size brk area */
410 stack_size = (stack_size + PAGE_SIZE - 409 stack_size = (stack_size + PAGE_SIZE - 1) & PAGE_MASK;
411 if (stack_size < PAGE_SIZE * 2) 410 if (stack_size < PAGE_SIZE * 2)
412 stack_size = PAGE_SIZE * 2; 411 stack_size = PAGE_SIZE * 2;
413 412
414 stack_prot = PROT_READ | PROT_WRITE; 413 stack_prot = PROT_READ | PROT_WRITE;
415 if (executable_stack == EXSTACK_ENABLE 414 if (executable_stack == EXSTACK_ENABLE_X ||
416 (executable_stack == EXSTACK_DEFAU 415 (executable_stack == EXSTACK_DEFAULT && VM_STACK_FLAGS & VM_EXEC))
417 stack_prot |= PROT_EXEC; 416 stack_prot |= PROT_EXEC;
418 417
419 current->mm->start_brk = vm_mmap(NULL, 418 current->mm->start_brk = vm_mmap(NULL, 0, stack_size, stack_prot,
420 MAP_P 419 MAP_PRIVATE | MAP_ANONYMOUS |
421 MAP_U 420 MAP_UNINITIALIZED | MAP_GROWSDOWN,
422 0); 421 0);
423 422
424 if (IS_ERR_VALUE(current->mm->start_br 423 if (IS_ERR_VALUE(current->mm->start_brk)) {
425 retval = current->mm->start_br 424 retval = current->mm->start_brk;
426 current->mm->start_brk = 0; 425 current->mm->start_brk = 0;
427 goto error; 426 goto error;
428 } 427 }
429 428
430 current->mm->brk = current->mm->start_ 429 current->mm->brk = current->mm->start_brk;
431 current->mm->context.end_brk = current 430 current->mm->context.end_brk = current->mm->start_brk;
432 current->mm->start_stack = current->mm 431 current->mm->start_stack = current->mm->start_brk + stack_size;
433 #endif 432 #endif
434 433
435 retval = create_elf_fdpic_tables(bprm, !! 434 install_exec_creds(bprm);
436 &inte !! 435 if (create_elf_fdpic_tables(bprm, current->mm,
437 if (retval < 0) !! 436 &exec_params, &interp_params) < 0)
438 goto error; 437 goto error;
439 438
440 kdebug("- start_code %lx", current->m 439 kdebug("- start_code %lx", current->mm->start_code);
441 kdebug("- end_code %lx", current->m 440 kdebug("- end_code %lx", current->mm->end_code);
442 kdebug("- start_data %lx", current->m 441 kdebug("- start_data %lx", current->mm->start_data);
443 kdebug("- end_data %lx", current->m 442 kdebug("- end_data %lx", current->mm->end_data);
444 kdebug("- start_brk %lx", current->m 443 kdebug("- start_brk %lx", current->mm->start_brk);
445 kdebug("- brk %lx", current->m 444 kdebug("- brk %lx", current->mm->brk);
446 kdebug("- start_stack %lx", current->m 445 kdebug("- start_stack %lx", current->mm->start_stack);
447 446
448 #ifdef ELF_FDPIC_PLAT_INIT 447 #ifdef ELF_FDPIC_PLAT_INIT
449 /* 448 /*
450 * The ABI may specify that certain re 449 * The ABI may specify that certain registers be set up in special
451 * ways (on i386 %edx is the address o 450 * ways (on i386 %edx is the address of a DT_FINI function, for
452 * example. This macro performs whate 451 * example. This macro performs whatever initialization to
453 * the regs structure is required. 452 * the regs structure is required.
454 */ 453 */
455 dynaddr = interp_params.dynamic_addr ? 454 dynaddr = interp_params.dynamic_addr ?: exec_params.dynamic_addr;
456 ELF_FDPIC_PLAT_INIT(regs, exec_params. 455 ELF_FDPIC_PLAT_INIT(regs, exec_params.map_addr, interp_params.map_addr,
457 dynaddr); 456 dynaddr);
458 #endif 457 #endif
459 458
460 finalize_exec(bprm); <<
461 /* everything is now ready... get the 459 /* everything is now ready... get the userspace context ready to roll */
462 entryaddr = interp_params.entry_addr ? 460 entryaddr = interp_params.entry_addr ?: exec_params.entry_addr;
463 start_thread(regs, entryaddr, current- 461 start_thread(regs, entryaddr, current->mm->start_stack);
464 462
465 retval = 0; 463 retval = 0;
466 464
467 error: 465 error:
468 if (interpreter) !! 466 if (interpreter) {
>> 467 allow_write_access(interpreter);
469 fput(interpreter); 468 fput(interpreter);
>> 469 }
470 kfree(interpreter_name); 470 kfree(interpreter_name);
471 kfree(exec_params.phdrs); 471 kfree(exec_params.phdrs);
472 kfree(exec_params.loadmap); 472 kfree(exec_params.loadmap);
473 kfree(interp_params.phdrs); 473 kfree(interp_params.phdrs);
474 kfree(interp_params.loadmap); 474 kfree(interp_params.loadmap);
475 return retval; 475 return retval;
476 } 476 }
477 477
478 /********************************************* 478 /*****************************************************************************/
479 479
480 #ifndef ELF_BASE_PLATFORM 480 #ifndef ELF_BASE_PLATFORM
481 /* 481 /*
482 * AT_BASE_PLATFORM indicates the "real" hardw 482 * AT_BASE_PLATFORM indicates the "real" hardware/microarchitecture.
483 * If the arch defines ELF_BASE_PLATFORM (in a 483 * If the arch defines ELF_BASE_PLATFORM (in asm/elf.h), the value
484 * will be copied to the user stack in the sam 484 * will be copied to the user stack in the same manner as AT_PLATFORM.
485 */ 485 */
486 #define ELF_BASE_PLATFORM NULL 486 #define ELF_BASE_PLATFORM NULL
487 #endif 487 #endif
488 488
489 /* 489 /*
490 * present useful information to the program b 490 * present useful information to the program by shovelling it onto the new
491 * process's stack 491 * process's stack
492 */ 492 */
493 static int create_elf_fdpic_tables(struct linu 493 static int create_elf_fdpic_tables(struct linux_binprm *bprm,
494 struct mm_s 494 struct mm_struct *mm,
495 struct elf_ 495 struct elf_fdpic_params *exec_params,
496 struct elf_ 496 struct elf_fdpic_params *interp_params)
497 { 497 {
498 const struct cred *cred = current_cred 498 const struct cred *cred = current_cred();
499 unsigned long sp, csp, nitems; 499 unsigned long sp, csp, nitems;
500 elf_caddr_t __user *argv, *envp; 500 elf_caddr_t __user *argv, *envp;
501 size_t platform_len = 0, len; 501 size_t platform_len = 0, len;
502 char *k_platform, *k_base_platform; 502 char *k_platform, *k_base_platform;
503 char __user *u_platform, *u_base_platf 503 char __user *u_platform, *u_base_platform, *p;
504 int loop; 504 int loop;
505 unsigned long flags = 0; !! 505 int nr; /* reset for each csp adjustment */
506 int ei_index; <<
507 elf_addr_t *elf_info; <<
508 506
509 #ifdef CONFIG_MMU 507 #ifdef CONFIG_MMU
510 /* In some cases (e.g. Hyper-Threading 508 /* In some cases (e.g. Hyper-Threading), we want to avoid L1 evictions
511 * by the processes running on the sam 509 * by the processes running on the same package. One thing we can do is
512 * to shuffle the initial stack for th 510 * to shuffle the initial stack for them, so we give the architecture
513 * an opportunity to do so here. 511 * an opportunity to do so here.
514 */ 512 */
515 sp = arch_align_stack(bprm->p); 513 sp = arch_align_stack(bprm->p);
516 #else 514 #else
517 sp = mm->start_stack; 515 sp = mm->start_stack;
518 516
519 /* stack the program arguments and env 517 /* stack the program arguments and environment */
520 if (transfer_args_to_stack(bprm, &sp) !! 518 if (elf_fdpic_transfer_args_to_stack(bprm, &sp) < 0)
521 return -EFAULT; 519 return -EFAULT;
522 sp &= ~15; <<
523 #endif 520 #endif
524 521
525 /* 522 /*
526 * If this architecture has a platform 523 * If this architecture has a platform capability string, copy it
527 * to userspace. In some cases (Sparc 524 * to userspace. In some cases (Sparc), this info is impossible
528 * for userspace to get any other way, 525 * for userspace to get any other way, in others (i386) it is
529 * merely difficult. 526 * merely difficult.
530 */ 527 */
531 k_platform = ELF_PLATFORM; 528 k_platform = ELF_PLATFORM;
532 u_platform = NULL; 529 u_platform = NULL;
533 530
534 if (k_platform) { 531 if (k_platform) {
535 platform_len = strlen(k_platfo 532 platform_len = strlen(k_platform) + 1;
536 sp -= platform_len; 533 sp -= platform_len;
537 u_platform = (char __user *) s 534 u_platform = (char __user *) sp;
538 if (copy_to_user(u_platform, k !! 535 if (__copy_to_user(u_platform, k_platform, platform_len) != 0)
539 return -EFAULT; 536 return -EFAULT;
540 } 537 }
541 538
542 /* 539 /*
543 * If this architecture has a "base" p 540 * If this architecture has a "base" platform capability
544 * string, copy it to userspace. 541 * string, copy it to userspace.
545 */ 542 */
546 k_base_platform = ELF_BASE_PLATFORM; 543 k_base_platform = ELF_BASE_PLATFORM;
547 u_base_platform = NULL; 544 u_base_platform = NULL;
548 545
549 if (k_base_platform) { 546 if (k_base_platform) {
550 platform_len = strlen(k_base_p 547 platform_len = strlen(k_base_platform) + 1;
551 sp -= platform_len; 548 sp -= platform_len;
552 u_base_platform = (char __user 549 u_base_platform = (char __user *) sp;
553 if (copy_to_user(u_base_platfo !! 550 if (__copy_to_user(u_base_platform, k_base_platform, platform_len) != 0)
554 return -EFAULT; 551 return -EFAULT;
555 } 552 }
556 553
557 sp &= ~7UL; 554 sp &= ~7UL;
558 555
559 /* stack the load map(s) */ 556 /* stack the load map(s) */
560 len = sizeof(struct elf_fdpic_loadmap) !! 557 len = sizeof(struct elf32_fdpic_loadmap);
561 len += sizeof(struct elf_fdpic_loadseg !! 558 len += sizeof(struct elf32_fdpic_loadseg) * exec_params->loadmap->nsegs;
562 sp = (sp - len) & ~7UL; 559 sp = (sp - len) & ~7UL;
563 exec_params->map_addr = sp; 560 exec_params->map_addr = sp;
564 561
565 if (copy_to_user((void __user *) sp, e 562 if (copy_to_user((void __user *) sp, exec_params->loadmap, len) != 0)
566 return -EFAULT; 563 return -EFAULT;
567 564
568 current->mm->context.exec_fdpic_loadma 565 current->mm->context.exec_fdpic_loadmap = (unsigned long) sp;
569 566
570 if (interp_params->loadmap) { 567 if (interp_params->loadmap) {
571 len = sizeof(struct elf_fdpic_ !! 568 len = sizeof(struct elf32_fdpic_loadmap);
572 len += sizeof(struct elf_fdpic !! 569 len += sizeof(struct elf32_fdpic_loadseg) *
573 interp_params->loadmap 570 interp_params->loadmap->nsegs;
574 sp = (sp - len) & ~7UL; 571 sp = (sp - len) & ~7UL;
575 interp_params->map_addr = sp; 572 interp_params->map_addr = sp;
576 573
577 if (copy_to_user((void __user 574 if (copy_to_user((void __user *) sp, interp_params->loadmap,
578 len) != 0) 575 len) != 0)
579 return -EFAULT; 576 return -EFAULT;
580 577
581 current->mm->context.interp_fd 578 current->mm->context.interp_fdpic_loadmap = (unsigned long) sp;
582 } 579 }
583 580
584 /* force 16 byte _final_ alignment her 581 /* force 16 byte _final_ alignment here for generality */
585 #define DLINFO_ITEMS 15 582 #define DLINFO_ITEMS 15
586 583
587 nitems = 1 + DLINFO_ITEMS + (k_platfor 584 nitems = 1 + DLINFO_ITEMS + (k_platform ? 1 : 0) +
588 (k_base_platform ? 1 : 0) + AT 585 (k_base_platform ? 1 : 0) + AT_VECTOR_SIZE_ARCH;
589 586
590 if (bprm->have_execfd) !! 587 if (bprm->interp_flags & BINPRM_FLAGS_EXECFD)
591 nitems++; 588 nitems++;
592 #ifdef ELF_HWCAP2 <<
593 nitems++; <<
594 #endif <<
595 589
596 csp = sp; 590 csp = sp;
597 sp -= nitems * 2 * sizeof(unsigned lon 591 sp -= nitems * 2 * sizeof(unsigned long);
598 sp -= (bprm->envc + 1) * sizeof(char * 592 sp -= (bprm->envc + 1) * sizeof(char *); /* envv[] */
599 sp -= (bprm->argc + 1) * sizeof(char * 593 sp -= (bprm->argc + 1) * sizeof(char *); /* argv[] */
600 sp -= 1 * sizeof(unsigned long); 594 sp -= 1 * sizeof(unsigned long); /* argc */
601 595
602 csp -= sp & 15UL; 596 csp -= sp & 15UL;
603 sp -= sp & 15UL; 597 sp -= sp & 15UL;
604 598
605 /* Create the ELF interpreter info */ !! 599 /* put the ELF interpreter info on the stack */
606 elf_info = (elf_addr_t *)mm->saved_aux !! 600 #define NEW_AUX_ENT(id, val) \
607 /* update AT_VECTOR_SIZE_BASE if the n !! 601 do { \
608 #define NEW_AUX_ENT(id, val) \ !! 602 struct { unsigned long _id, _val; } __user *ent; \
609 do { \ !! 603 \
610 *elf_info++ = id; \ !! 604 ent = (void __user *) csp; \
611 *elf_info++ = val; \ !! 605 __put_user((id), &ent[nr]._id); \
>> 606 __put_user((val), &ent[nr]._val); \
>> 607 nr++; \
612 } while (0) 608 } while (0)
613 609
614 #ifdef ARCH_DLINFO !! 610 nr = 0;
615 /* !! 611 csp -= 2 * sizeof(unsigned long);
616 * ARCH_DLINFO must come first so PPC !! 612 NEW_AUX_ENT(AT_NULL, 0);
617 * AUXV. !! 613 if (k_platform) {
618 * update AT_VECTOR_SIZE_ARCH if the n !! 614 nr = 0;
619 * ARCH_DLINFO changes !! 615 csp -= 2 * sizeof(unsigned long);
620 */ !! 616 NEW_AUX_ENT(AT_PLATFORM,
621 ARCH_DLINFO; !! 617 (elf_addr_t) (unsigned long) u_platform);
622 #endif !! 618 }
>> 619
>> 620 if (k_base_platform) {
>> 621 nr = 0;
>> 622 csp -= 2 * sizeof(unsigned long);
>> 623 NEW_AUX_ENT(AT_BASE_PLATFORM,
>> 624 (elf_addr_t) (unsigned long) u_base_platform);
>> 625 }
>> 626
>> 627 if (bprm->interp_flags & BINPRM_FLAGS_EXECFD) {
>> 628 nr = 0;
>> 629 csp -= 2 * sizeof(unsigned long);
>> 630 NEW_AUX_ENT(AT_EXECFD, bprm->interp_data);
>> 631 }
>> 632
>> 633 nr = 0;
>> 634 csp -= DLINFO_ITEMS * 2 * sizeof(unsigned long);
623 NEW_AUX_ENT(AT_HWCAP, ELF_HWCAP); 635 NEW_AUX_ENT(AT_HWCAP, ELF_HWCAP);
624 #ifdef ELF_HWCAP2 636 #ifdef ELF_HWCAP2
625 NEW_AUX_ENT(AT_HWCAP2, ELF_HWCAP2); 637 NEW_AUX_ENT(AT_HWCAP2, ELF_HWCAP2);
626 #endif 638 #endif
627 NEW_AUX_ENT(AT_PAGESZ, PAGE_SIZE); 639 NEW_AUX_ENT(AT_PAGESZ, PAGE_SIZE);
628 NEW_AUX_ENT(AT_CLKTCK, CLOCKS_PER_SEC 640 NEW_AUX_ENT(AT_CLKTCK, CLOCKS_PER_SEC);
629 NEW_AUX_ENT(AT_PHDR, exec_params->p 641 NEW_AUX_ENT(AT_PHDR, exec_params->ph_addr);
630 NEW_AUX_ENT(AT_PHENT, sizeof(struct 642 NEW_AUX_ENT(AT_PHENT, sizeof(struct elf_phdr));
631 NEW_AUX_ENT(AT_PHNUM, exec_params->h 643 NEW_AUX_ENT(AT_PHNUM, exec_params->hdr.e_phnum);
632 NEW_AUX_ENT(AT_BASE, interp_params- 644 NEW_AUX_ENT(AT_BASE, interp_params->elfhdr_addr);
633 if (bprm->interp_flags & BINPRM_FLAGS_ !! 645 NEW_AUX_ENT(AT_FLAGS, 0);
634 flags |= AT_FLAGS_PRESERVE_ARG <<
635 NEW_AUX_ENT(AT_FLAGS, flags); <<
636 NEW_AUX_ENT(AT_ENTRY, exec_params->e 646 NEW_AUX_ENT(AT_ENTRY, exec_params->entry_addr);
637 NEW_AUX_ENT(AT_UID, (elf_addr_t) f 647 NEW_AUX_ENT(AT_UID, (elf_addr_t) from_kuid_munged(cred->user_ns, cred->uid));
638 NEW_AUX_ENT(AT_EUID, (elf_addr_t) f 648 NEW_AUX_ENT(AT_EUID, (elf_addr_t) from_kuid_munged(cred->user_ns, cred->euid));
639 NEW_AUX_ENT(AT_GID, (elf_addr_t) f 649 NEW_AUX_ENT(AT_GID, (elf_addr_t) from_kgid_munged(cred->user_ns, cred->gid));
640 NEW_AUX_ENT(AT_EGID, (elf_addr_t) f 650 NEW_AUX_ENT(AT_EGID, (elf_addr_t) from_kgid_munged(cred->user_ns, cred->egid));
641 NEW_AUX_ENT(AT_SECURE, bprm->secureex !! 651 NEW_AUX_ENT(AT_SECURE, security_bprm_secureexec(bprm));
642 NEW_AUX_ENT(AT_EXECFN, bprm->exec); 652 NEW_AUX_ENT(AT_EXECFN, bprm->exec);
643 if (k_platform) !! 653
644 NEW_AUX_ENT(AT_PLATFORM, !! 654 #ifdef ARCH_DLINFO
645 (elf_addr_t)(unsig !! 655 nr = 0;
646 if (k_base_platform) !! 656 csp -= AT_VECTOR_SIZE_ARCH * 2 * sizeof(unsigned long);
647 NEW_AUX_ENT(AT_BASE_PLATFORM, !! 657
648 (elf_addr_t)(unsig !! 658 /* ARCH_DLINFO must come last so platform specific code can enforce
649 if (bprm->have_execfd) !! 659 * special alignment requirements on the AUXV if necessary (eg. PPC).
650 NEW_AUX_ENT(AT_EXECFD, bprm->e !! 660 */
>> 661 ARCH_DLINFO;
>> 662 #endif
651 #undef NEW_AUX_ENT 663 #undef NEW_AUX_ENT
652 /* AT_NULL is zero; clear the rest too <<
653 memset(elf_info, 0, (char *)mm->saved_ <<
654 sizeof(mm->saved_auxv) - (char <<
655 <<
656 /* And advance past the AT_NULL entry. <<
657 elf_info += 2; <<
658 <<
659 ei_index = elf_info - (elf_addr_t *)mm <<
660 csp -= ei_index * sizeof(elf_addr_t); <<
661 <<
662 /* Put the elf_info on the stack in th <<
663 if (copy_to_user((void __user *)csp, m <<
664 ei_index * sizeof(elf <<
665 return -EFAULT; <<
666 664
667 /* allocate room for argv[] and envv[] 665 /* allocate room for argv[] and envv[] */
668 csp -= (bprm->envc + 1) * sizeof(elf_c 666 csp -= (bprm->envc + 1) * sizeof(elf_caddr_t);
669 envp = (elf_caddr_t __user *) csp; 667 envp = (elf_caddr_t __user *) csp;
670 csp -= (bprm->argc + 1) * sizeof(elf_c 668 csp -= (bprm->argc + 1) * sizeof(elf_caddr_t);
671 argv = (elf_caddr_t __user *) csp; 669 argv = (elf_caddr_t __user *) csp;
672 670
673 /* stack argc */ 671 /* stack argc */
674 csp -= sizeof(unsigned long); 672 csp -= sizeof(unsigned long);
675 if (put_user(bprm->argc, (unsigned lon !! 673 __put_user(bprm->argc, (unsigned long __user *) csp);
676 return -EFAULT; <<
677 674
678 BUG_ON(csp != sp); 675 BUG_ON(csp != sp);
679 676
680 /* fill in the argv[] array */ 677 /* fill in the argv[] array */
681 #ifdef CONFIG_MMU 678 #ifdef CONFIG_MMU
682 current->mm->arg_start = bprm->p; 679 current->mm->arg_start = bprm->p;
683 #else 680 #else
684 current->mm->arg_start = current->mm-> 681 current->mm->arg_start = current->mm->start_stack -
685 (MAX_ARG_PAGES * PAGE_SIZE - b 682 (MAX_ARG_PAGES * PAGE_SIZE - bprm->p);
686 #endif 683 #endif
687 684
688 p = (char __user *) current->mm->arg_s 685 p = (char __user *) current->mm->arg_start;
689 for (loop = bprm->argc; loop > 0; loop 686 for (loop = bprm->argc; loop > 0; loop--) {
690 if (put_user((elf_caddr_t) p, !! 687 __put_user((elf_caddr_t) p, argv++);
691 return -EFAULT; <<
692 len = strnlen_user(p, MAX_ARG_ 688 len = strnlen_user(p, MAX_ARG_STRLEN);
693 if (!len || len > MAX_ARG_STRL 689 if (!len || len > MAX_ARG_STRLEN)
694 return -EINVAL; 690 return -EINVAL;
695 p += len; 691 p += len;
696 } 692 }
697 if (put_user(NULL, argv)) !! 693 __put_user(NULL, argv);
698 return -EFAULT; <<
699 current->mm->arg_end = (unsigned long) 694 current->mm->arg_end = (unsigned long) p;
700 695
701 /* fill in the envv[] array */ 696 /* fill in the envv[] array */
702 current->mm->env_start = (unsigned lon 697 current->mm->env_start = (unsigned long) p;
703 for (loop = bprm->envc; loop > 0; loop 698 for (loop = bprm->envc; loop > 0; loop--) {
704 if (put_user((elf_caddr_t)(uns !! 699 __put_user((elf_caddr_t)(unsigned long) p, envp++);
705 return -EFAULT; <<
706 len = strnlen_user(p, MAX_ARG_ 700 len = strnlen_user(p, MAX_ARG_STRLEN);
707 if (!len || len > MAX_ARG_STRL 701 if (!len || len > MAX_ARG_STRLEN)
708 return -EINVAL; 702 return -EINVAL;
709 p += len; 703 p += len;
710 } 704 }
711 if (put_user(NULL, envp)) !! 705 __put_user(NULL, envp);
712 return -EFAULT; <<
713 current->mm->env_end = (unsigned long) 706 current->mm->env_end = (unsigned long) p;
714 707
715 mm->start_stack = (unsigned long) sp; 708 mm->start_stack = (unsigned long) sp;
716 return 0; 709 return 0;
717 } 710 }
718 711
719 /********************************************* 712 /*****************************************************************************/
720 /* 713 /*
>> 714 * transfer the program arguments and environment from the holding pages onto
>> 715 * the stack
>> 716 */
>> 717 #ifndef CONFIG_MMU
>> 718 static int elf_fdpic_transfer_args_to_stack(struct linux_binprm *bprm,
>> 719 unsigned long *_sp)
>> 720 {
>> 721 unsigned long index, stop, sp;
>> 722 char *src;
>> 723 int ret = 0;
>> 724
>> 725 stop = bprm->p >> PAGE_SHIFT;
>> 726 sp = *_sp;
>> 727
>> 728 for (index = MAX_ARG_PAGES - 1; index >= stop; index--) {
>> 729 src = kmap(bprm->page[index]);
>> 730 sp -= PAGE_SIZE;
>> 731 if (copy_to_user((void *) sp, src, PAGE_SIZE) != 0)
>> 732 ret = -EFAULT;
>> 733 kunmap(bprm->page[index]);
>> 734 if (ret < 0)
>> 735 goto out;
>> 736 }
>> 737
>> 738 *_sp = (*_sp - (MAX_ARG_PAGES * PAGE_SIZE - bprm->p)) & ~15;
>> 739
>> 740 out:
>> 741 return ret;
>> 742 }
>> 743 #endif
>> 744
>> 745 /*****************************************************************************/
>> 746 /*
721 * load the appropriate binary image (executab 747 * load the appropriate binary image (executable or interpreter) into memory
722 * - we assume no MMU is available 748 * - we assume no MMU is available
723 * - if no other PIC bits are set in params->h 749 * - if no other PIC bits are set in params->hdr->e_flags
724 * - we assume that the LOADable segments in 750 * - we assume that the LOADable segments in the binary are independently relocatable
725 * - we assume R/O executable segments are s 751 * - we assume R/O executable segments are shareable
726 * - else 752 * - else
727 * - we assume the loadable parts of the ima 753 * - we assume the loadable parts of the image to require fixed displacement
728 * - the image is not shareable 754 * - the image is not shareable
729 */ 755 */
730 static int elf_fdpic_map_file(struct elf_fdpic 756 static int elf_fdpic_map_file(struct elf_fdpic_params *params,
731 struct file *fil 757 struct file *file,
732 struct mm_struct 758 struct mm_struct *mm,
733 const char *what 759 const char *what)
734 { 760 {
735 struct elf_fdpic_loadmap *loadmap; !! 761 struct elf32_fdpic_loadmap *loadmap;
736 #ifdef CONFIG_MMU 762 #ifdef CONFIG_MMU
737 struct elf_fdpic_loadseg *mseg; !! 763 struct elf32_fdpic_loadseg *mseg;
738 unsigned long load_addr; <<
739 #endif 764 #endif
740 struct elf_fdpic_loadseg *seg; !! 765 struct elf32_fdpic_loadseg *seg;
741 struct elf_phdr *phdr; !! 766 struct elf32_phdr *phdr;
>> 767 unsigned long load_addr, stop;
742 unsigned nloads, tmp; 768 unsigned nloads, tmp;
743 unsigned long stop; !! 769 size_t size;
744 int loop, ret; 770 int loop, ret;
745 771
746 /* allocate a load map table */ 772 /* allocate a load map table */
747 nloads = 0; 773 nloads = 0;
748 for (loop = 0; loop < params->hdr.e_ph 774 for (loop = 0; loop < params->hdr.e_phnum; loop++)
749 if (params->phdrs[loop].p_type 775 if (params->phdrs[loop].p_type == PT_LOAD)
750 nloads++; 776 nloads++;
751 777
752 if (nloads == 0) 778 if (nloads == 0)
753 return -ELIBBAD; 779 return -ELIBBAD;
754 780
755 loadmap = kzalloc(struct_size(loadmap, !! 781 size = sizeof(*loadmap) + nloads * sizeof(*seg);
>> 782 loadmap = kzalloc(size, GFP_KERNEL);
756 if (!loadmap) 783 if (!loadmap)
757 return -ENOMEM; 784 return -ENOMEM;
758 785
759 params->loadmap = loadmap; 786 params->loadmap = loadmap;
760 787
761 loadmap->version = ELF_FDPIC_LOADMAP_V !! 788 loadmap->version = ELF32_FDPIC_LOADMAP_VERSION;
762 loadmap->nsegs = nloads; 789 loadmap->nsegs = nloads;
763 790
>> 791 load_addr = params->load_addr;
>> 792 seg = loadmap->segs;
>> 793
764 /* map the requested LOADs into the me 794 /* map the requested LOADs into the memory space */
765 switch (params->flags & ELF_FDPIC_FLAG 795 switch (params->flags & ELF_FDPIC_FLAG_ARRANGEMENT) {
766 case ELF_FDPIC_FLAG_CONSTDISP: 796 case ELF_FDPIC_FLAG_CONSTDISP:
767 case ELF_FDPIC_FLAG_CONTIGUOUS: 797 case ELF_FDPIC_FLAG_CONTIGUOUS:
768 #ifndef CONFIG_MMU 798 #ifndef CONFIG_MMU
769 ret = elf_fdpic_map_file_const 799 ret = elf_fdpic_map_file_constdisp_on_uclinux(params, file, mm);
770 if (ret < 0) 800 if (ret < 0)
771 return ret; 801 return ret;
772 break; 802 break;
773 #endif 803 #endif
774 default: 804 default:
775 ret = elf_fdpic_map_file_by_di 805 ret = elf_fdpic_map_file_by_direct_mmap(params, file, mm);
776 if (ret < 0) 806 if (ret < 0)
777 return ret; 807 return ret;
778 break; 808 break;
779 } 809 }
780 810
781 /* map the entry point */ 811 /* map the entry point */
782 if (params->hdr.e_entry) { 812 if (params->hdr.e_entry) {
783 seg = loadmap->segs; 813 seg = loadmap->segs;
784 for (loop = loadmap->nsegs; lo 814 for (loop = loadmap->nsegs; loop > 0; loop--, seg++) {
785 if (params->hdr.e_entr 815 if (params->hdr.e_entry >= seg->p_vaddr &&
786 params->hdr.e_entr 816 params->hdr.e_entry < seg->p_vaddr + seg->p_memsz) {
787 params->entry_ 817 params->entry_addr =
788 (param 818 (params->hdr.e_entry - seg->p_vaddr) +
789 seg->a 819 seg->addr;
790 break; 820 break;
791 } 821 }
792 } 822 }
793 } 823 }
794 824
795 /* determine where the program header 825 /* determine where the program header table has wound up if mapped */
796 stop = params->hdr.e_phoff; 826 stop = params->hdr.e_phoff;
797 stop += params->hdr.e_phnum * sizeof ( 827 stop += params->hdr.e_phnum * sizeof (struct elf_phdr);
798 phdr = params->phdrs; 828 phdr = params->phdrs;
799 829
800 for (loop = 0; loop < params->hdr.e_ph 830 for (loop = 0; loop < params->hdr.e_phnum; loop++, phdr++) {
801 if (phdr->p_type != PT_LOAD) 831 if (phdr->p_type != PT_LOAD)
802 continue; 832 continue;
803 833
804 if (phdr->p_offset > params->h 834 if (phdr->p_offset > params->hdr.e_phoff ||
805 phdr->p_offset + phdr->p_f 835 phdr->p_offset + phdr->p_filesz < stop)
806 continue; 836 continue;
807 837
808 seg = loadmap->segs; 838 seg = loadmap->segs;
809 for (loop = loadmap->nsegs; lo 839 for (loop = loadmap->nsegs; loop > 0; loop--, seg++) {
810 if (phdr->p_vaddr >= s 840 if (phdr->p_vaddr >= seg->p_vaddr &&
811 phdr->p_vaddr + ph 841 phdr->p_vaddr + phdr->p_filesz <=
812 seg->p_vaddr + seg 842 seg->p_vaddr + seg->p_memsz) {
813 params->ph_add 843 params->ph_addr =
814 (phdr- 844 (phdr->p_vaddr - seg->p_vaddr) +
815 seg->a 845 seg->addr +
816 params 846 params->hdr.e_phoff - phdr->p_offset;
817 break; 847 break;
818 } 848 }
819 } 849 }
820 break; 850 break;
821 } 851 }
822 852
823 /* determine where the dynamic section 853 /* determine where the dynamic section has wound up if there is one */
824 phdr = params->phdrs; 854 phdr = params->phdrs;
825 for (loop = 0; loop < params->hdr.e_ph 855 for (loop = 0; loop < params->hdr.e_phnum; loop++, phdr++) {
826 if (phdr->p_type != PT_DYNAMIC 856 if (phdr->p_type != PT_DYNAMIC)
827 continue; 857 continue;
828 858
829 seg = loadmap->segs; 859 seg = loadmap->segs;
830 for (loop = loadmap->nsegs; lo 860 for (loop = loadmap->nsegs; loop > 0; loop--, seg++) {
831 if (phdr->p_vaddr >= s 861 if (phdr->p_vaddr >= seg->p_vaddr &&
832 phdr->p_vaddr + ph 862 phdr->p_vaddr + phdr->p_memsz <=
833 seg->p_vaddr + seg 863 seg->p_vaddr + seg->p_memsz) {
834 Elf_Dyn __user <<
835 Elf_Sword d_ta <<
836 <<
837 params->dynami 864 params->dynamic_addr =
838 (phdr- 865 (phdr->p_vaddr - seg->p_vaddr) +
839 seg->a 866 seg->addr;
840 867
841 /* check the d 868 /* check the dynamic section contains at least
842 * one item, a 869 * one item, and that the last item is a NULL
843 * entry */ 870 * entry */
844 if (phdr->p_me 871 if (phdr->p_memsz == 0 ||
845 phdr->p_me !! 872 phdr->p_memsz % sizeof(Elf32_Dyn) != 0)
846 goto d 873 goto dynamic_error;
847 874
848 tmp = phdr->p_ !! 875 tmp = phdr->p_memsz / sizeof(Elf32_Dyn);
849 dyn = (Elf_Dyn !! 876 if (((Elf32_Dyn *)
850 if (get_user(d !! 877 params->dynamic_addr)[tmp - 1].d_tag != 0)
851 d_tag != 0 <<
852 goto d 878 goto dynamic_error;
853 break; 879 break;
854 } 880 }
855 } 881 }
856 break; 882 break;
857 } 883 }
858 884
859 /* now elide adjacent segments in the 885 /* now elide adjacent segments in the load map on MMU linux
860 * - on uClinux the holes between may 886 * - on uClinux the holes between may actually be filled with system
861 * stuff or stuff from other process 887 * stuff or stuff from other processes
862 */ 888 */
863 #ifdef CONFIG_MMU 889 #ifdef CONFIG_MMU
864 nloads = loadmap->nsegs; 890 nloads = loadmap->nsegs;
865 mseg = loadmap->segs; 891 mseg = loadmap->segs;
866 seg = mseg + 1; 892 seg = mseg + 1;
867 for (loop = 1; loop < nloads; loop++) 893 for (loop = 1; loop < nloads; loop++) {
868 /* see if we have a candidate 894 /* see if we have a candidate for merging */
869 if (seg->p_vaddr - mseg->p_vad 895 if (seg->p_vaddr - mseg->p_vaddr == seg->addr - mseg->addr) {
870 load_addr = PAGE_ALIGN 896 load_addr = PAGE_ALIGN(mseg->addr + mseg->p_memsz);
871 if (load_addr == (seg- 897 if (load_addr == (seg->addr & PAGE_MASK)) {
872 mseg->p_memsz 898 mseg->p_memsz +=
873 load_a 899 load_addr -
874 (mseg- 900 (mseg->addr + mseg->p_memsz);
875 mseg->p_memsz 901 mseg->p_memsz += seg->addr & ~PAGE_MASK;
876 mseg->p_memsz 902 mseg->p_memsz += seg->p_memsz;
877 loadmap->nsegs 903 loadmap->nsegs--;
878 continue; 904 continue;
879 } 905 }
880 } 906 }
881 907
882 mseg++; 908 mseg++;
883 if (mseg != seg) 909 if (mseg != seg)
884 *mseg = *seg; 910 *mseg = *seg;
885 } 911 }
886 #endif 912 #endif
887 913
888 kdebug("Mapped Object [%s]:", what); 914 kdebug("Mapped Object [%s]:", what);
889 kdebug("- elfhdr : %lx", params->elf 915 kdebug("- elfhdr : %lx", params->elfhdr_addr);
890 kdebug("- entry : %lx", params->ent 916 kdebug("- entry : %lx", params->entry_addr);
891 kdebug("- PHDR[] : %lx", params->ph_ 917 kdebug("- PHDR[] : %lx", params->ph_addr);
892 kdebug("- DYNAMIC[]: %lx", params->dyn 918 kdebug("- DYNAMIC[]: %lx", params->dynamic_addr);
893 seg = loadmap->segs; 919 seg = loadmap->segs;
894 for (loop = 0; loop < loadmap->nsegs; 920 for (loop = 0; loop < loadmap->nsegs; loop++, seg++)
895 kdebug("- LOAD[%d] : %08llx-%0 !! 921 kdebug("- LOAD[%d] : %08x-%08x [va=%x ms=%x]",
896 loop, 922 loop,
897 (unsigned long long) se !! 923 seg->addr, seg->addr + seg->p_memsz - 1,
898 (unsigned long long) se !! 924 seg->p_vaddr, seg->p_memsz);
899 (unsigned long long) se <<
900 (unsigned long long) se <<
901 925
902 return 0; 926 return 0;
903 927
904 dynamic_error: 928 dynamic_error:
905 printk("ELF FDPIC %s with invalid DYNA 929 printk("ELF FDPIC %s with invalid DYNAMIC section (inode=%lu)\n",
906 what, file_inode(file)->i_ino); 930 what, file_inode(file)->i_ino);
907 return -ELIBBAD; 931 return -ELIBBAD;
908 } 932 }
909 933
910 /********************************************* 934 /*****************************************************************************/
911 /* 935 /*
912 * map a file with constant displacement under 936 * map a file with constant displacement under uClinux
913 */ 937 */
914 #ifndef CONFIG_MMU 938 #ifndef CONFIG_MMU
915 static int elf_fdpic_map_file_constdisp_on_ucl 939 static int elf_fdpic_map_file_constdisp_on_uclinux(
916 struct elf_fdpic_params *params, 940 struct elf_fdpic_params *params,
917 struct file *file, 941 struct file *file,
918 struct mm_struct *mm) 942 struct mm_struct *mm)
919 { 943 {
920 struct elf_fdpic_loadseg *seg; !! 944 struct elf32_fdpic_loadseg *seg;
921 struct elf_phdr *phdr; !! 945 struct elf32_phdr *phdr;
922 unsigned long load_addr, base = ULONG_ !! 946 unsigned long load_addr, base = ULONG_MAX, top = 0, maddr = 0, mflags;
923 int loop, ret; 947 int loop, ret;
924 948
925 load_addr = params->load_addr; 949 load_addr = params->load_addr;
926 seg = params->loadmap->segs; 950 seg = params->loadmap->segs;
927 951
928 /* determine the bounds of the contigu 952 /* determine the bounds of the contiguous overall allocation we must
929 * make */ 953 * make */
930 phdr = params->phdrs; 954 phdr = params->phdrs;
931 for (loop = 0; loop < params->hdr.e_ph 955 for (loop = 0; loop < params->hdr.e_phnum; loop++, phdr++) {
932 if (params->phdrs[loop].p_type 956 if (params->phdrs[loop].p_type != PT_LOAD)
933 continue; 957 continue;
934 958
935 if (base > phdr->p_vaddr) 959 if (base > phdr->p_vaddr)
936 base = phdr->p_vaddr; 960 base = phdr->p_vaddr;
937 if (top < phdr->p_vaddr + phdr 961 if (top < phdr->p_vaddr + phdr->p_memsz)
938 top = phdr->p_vaddr + 962 top = phdr->p_vaddr + phdr->p_memsz;
939 } 963 }
940 964
941 /* allocate one big anon block for eve 965 /* allocate one big anon block for everything */
>> 966 mflags = MAP_PRIVATE;
>> 967 if (params->flags & ELF_FDPIC_FLAG_EXECUTABLE)
>> 968 mflags |= MAP_EXECUTABLE;
>> 969
942 maddr = vm_mmap(NULL, load_addr, top - 970 maddr = vm_mmap(NULL, load_addr, top - base,
943 PROT_READ | PROT_WRITE !! 971 PROT_READ | PROT_WRITE | PROT_EXEC, mflags, 0);
944 if (IS_ERR_VALUE(maddr)) 972 if (IS_ERR_VALUE(maddr))
945 return (int) maddr; 973 return (int) maddr;
946 974
947 if (load_addr != 0) 975 if (load_addr != 0)
948 load_addr += PAGE_ALIGN(top - 976 load_addr += PAGE_ALIGN(top - base);
949 977
950 /* and then load the file segments int 978 /* and then load the file segments into it */
951 phdr = params->phdrs; 979 phdr = params->phdrs;
952 for (loop = 0; loop < params->hdr.e_ph 980 for (loop = 0; loop < params->hdr.e_phnum; loop++, phdr++) {
953 if (params->phdrs[loop].p_type 981 if (params->phdrs[loop].p_type != PT_LOAD)
954 continue; 982 continue;
955 983
956 seg->addr = maddr + (phdr->p_v 984 seg->addr = maddr + (phdr->p_vaddr - base);
957 seg->p_vaddr = phdr->p_vaddr; 985 seg->p_vaddr = phdr->p_vaddr;
958 seg->p_memsz = phdr->p_memsz; 986 seg->p_memsz = phdr->p_memsz;
959 987
960 ret = read_code(file, seg->add 988 ret = read_code(file, seg->addr, phdr->p_offset,
961 phdr->p 989 phdr->p_filesz);
962 if (ret < 0) 990 if (ret < 0)
963 return ret; 991 return ret;
964 992
965 /* map the ELF header address 993 /* map the ELF header address if in this segment */
966 if (phdr->p_offset == 0) 994 if (phdr->p_offset == 0)
967 params->elfhdr_addr = 995 params->elfhdr_addr = seg->addr;
968 996
969 /* clear any space allocated b 997 /* clear any space allocated but not loaded */
970 if (phdr->p_filesz < phdr->p_m 998 if (phdr->p_filesz < phdr->p_memsz) {
971 if (clear_user((void * 999 if (clear_user((void *) (seg->addr + phdr->p_filesz),
972 phdr->p 1000 phdr->p_memsz - phdr->p_filesz))
973 return -EFAULT 1001 return -EFAULT;
974 } 1002 }
975 1003
976 if (mm) { 1004 if (mm) {
977 if (phdr->p_flags & PF 1005 if (phdr->p_flags & PF_X) {
978 if (!mm->start 1006 if (!mm->start_code) {
979 mm->st 1007 mm->start_code = seg->addr;
980 mm->en 1008 mm->end_code = seg->addr +
981 1009 phdr->p_memsz;
982 } 1010 }
983 } else if (!mm->start_ 1011 } else if (!mm->start_data) {
984 mm->start_data 1012 mm->start_data = seg->addr;
985 mm->end_data = 1013 mm->end_data = seg->addr + phdr->p_memsz;
986 } 1014 }
987 } 1015 }
988 1016
989 seg++; 1017 seg++;
990 } 1018 }
991 1019
992 return 0; 1020 return 0;
993 } 1021 }
994 #endif 1022 #endif
995 1023
996 /********************************************* 1024 /*****************************************************************************/
997 /* 1025 /*
998 * map a binary by direct mmap() of the indivi 1026 * map a binary by direct mmap() of the individual PT_LOAD segments
999 */ 1027 */
1000 static int elf_fdpic_map_file_by_direct_mmap( 1028 static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params,
1001 1029 struct file *file,
1002 1030 struct mm_struct *mm)
1003 { 1031 {
1004 struct elf_fdpic_loadseg *seg; !! 1032 struct elf32_fdpic_loadseg *seg;
1005 struct elf_phdr *phdr; !! 1033 struct elf32_phdr *phdr;
1006 unsigned long load_addr, delta_vaddr; 1034 unsigned long load_addr, delta_vaddr;
1007 int loop, dvset; 1035 int loop, dvset;
1008 1036
1009 load_addr = params->load_addr; 1037 load_addr = params->load_addr;
1010 delta_vaddr = 0; 1038 delta_vaddr = 0;
1011 dvset = 0; 1039 dvset = 0;
1012 1040
1013 seg = params->loadmap->segs; 1041 seg = params->loadmap->segs;
1014 1042
1015 /* deal with each load segment separa 1043 /* deal with each load segment separately */
1016 phdr = params->phdrs; 1044 phdr = params->phdrs;
1017 for (loop = 0; loop < params->hdr.e_p 1045 for (loop = 0; loop < params->hdr.e_phnum; loop++, phdr++) {
1018 unsigned long maddr, disp, ex 1046 unsigned long maddr, disp, excess, excess1;
1019 int prot = 0, flags; 1047 int prot = 0, flags;
1020 1048
1021 if (phdr->p_type != PT_LOAD) 1049 if (phdr->p_type != PT_LOAD)
1022 continue; 1050 continue;
1023 1051
1024 kdebug("[LOAD] va=%lx of=%lx 1052 kdebug("[LOAD] va=%lx of=%lx fs=%lx ms=%lx",
1025 (unsigned long) phdr-> 1053 (unsigned long) phdr->p_vaddr,
1026 (unsigned long) phdr-> 1054 (unsigned long) phdr->p_offset,
1027 (unsigned long) phdr-> 1055 (unsigned long) phdr->p_filesz,
1028 (unsigned long) phdr-> 1056 (unsigned long) phdr->p_memsz);
1029 1057
1030 /* determine the mapping para 1058 /* determine the mapping parameters */
1031 if (phdr->p_flags & PF_R) pro 1059 if (phdr->p_flags & PF_R) prot |= PROT_READ;
1032 if (phdr->p_flags & PF_W) pro 1060 if (phdr->p_flags & PF_W) prot |= PROT_WRITE;
1033 if (phdr->p_flags & PF_X) pro 1061 if (phdr->p_flags & PF_X) prot |= PROT_EXEC;
1034 1062
1035 flags = MAP_PRIVATE; !! 1063 flags = MAP_PRIVATE | MAP_DENYWRITE;
>> 1064 if (params->flags & ELF_FDPIC_FLAG_EXECUTABLE)
>> 1065 flags |= MAP_EXECUTABLE;
>> 1066
1036 maddr = 0; 1067 maddr = 0;
1037 1068
1038 switch (params->flags & ELF_F 1069 switch (params->flags & ELF_FDPIC_FLAG_ARRANGEMENT) {
1039 case ELF_FDPIC_FLAG_INDEPENDE 1070 case ELF_FDPIC_FLAG_INDEPENDENT:
1040 /* PT_LOADs are indep 1071 /* PT_LOADs are independently locatable */
1041 break; 1072 break;
1042 1073
1043 case ELF_FDPIC_FLAG_HONOURVAD 1074 case ELF_FDPIC_FLAG_HONOURVADDR:
1044 /* the specified virt 1075 /* the specified virtual address must be honoured */
1045 maddr = phdr->p_vaddr 1076 maddr = phdr->p_vaddr;
1046 flags |= MAP_FIXED; 1077 flags |= MAP_FIXED;
1047 break; 1078 break;
1048 1079
1049 case ELF_FDPIC_FLAG_CONSTDISP 1080 case ELF_FDPIC_FLAG_CONSTDISP:
1050 /* constant displacem 1081 /* constant displacement
1051 * - can be mapped an 1082 * - can be mapped anywhere, but must be mapped as a
1052 * unit 1083 * unit
1053 */ 1084 */
1054 if (!dvset) { 1085 if (!dvset) {
1055 maddr = load_ 1086 maddr = load_addr;
1056 delta_vaddr = 1087 delta_vaddr = phdr->p_vaddr;
1057 dvset = 1; 1088 dvset = 1;
1058 } else { 1089 } else {
1059 maddr = load_ 1090 maddr = load_addr + phdr->p_vaddr - delta_vaddr;
1060 flags |= MAP_ 1091 flags |= MAP_FIXED;
1061 } 1092 }
1062 break; 1093 break;
1063 1094
1064 case ELF_FDPIC_FLAG_CONTIGUOU 1095 case ELF_FDPIC_FLAG_CONTIGUOUS:
1065 /* contiguity handled 1096 /* contiguity handled later */
1066 break; 1097 break;
1067 1098
1068 default: 1099 default:
1069 BUG(); 1100 BUG();
1070 } 1101 }
1071 1102
1072 maddr &= PAGE_MASK; 1103 maddr &= PAGE_MASK;
1073 1104
1074 /* create the mapping */ 1105 /* create the mapping */
1075 disp = phdr->p_vaddr & ~PAGE_ 1106 disp = phdr->p_vaddr & ~PAGE_MASK;
1076 maddr = vm_mmap(file, maddr, 1107 maddr = vm_mmap(file, maddr, phdr->p_memsz + disp, prot, flags,
1077 phdr->p_offse 1108 phdr->p_offset - disp);
1078 1109
1079 kdebug("mmap[%d] <file> sz=%l !! 1110 kdebug("mmap[%d] <file> sz=%lx pr=%x fl=%x of=%lx --> %08lx",
1080 loop, (unsigned long l !! 1111 loop, phdr->p_memsz + disp, prot, flags,
1081 prot, flags, (unsigned !! 1112 phdr->p_offset - disp, maddr);
1082 maddr); <<
1083 1113
1084 if (IS_ERR_VALUE(maddr)) 1114 if (IS_ERR_VALUE(maddr))
1085 return (int) maddr; 1115 return (int) maddr;
1086 1116
1087 if ((params->flags & ELF_FDPI 1117 if ((params->flags & ELF_FDPIC_FLAG_ARRANGEMENT) ==
1088 ELF_FDPIC_FLAG_CONTIGUOUS 1118 ELF_FDPIC_FLAG_CONTIGUOUS)
1089 load_addr += PAGE_ALI 1119 load_addr += PAGE_ALIGN(phdr->p_memsz + disp);
1090 1120
1091 seg->addr = maddr + disp; 1121 seg->addr = maddr + disp;
1092 seg->p_vaddr = phdr->p_vaddr; 1122 seg->p_vaddr = phdr->p_vaddr;
1093 seg->p_memsz = phdr->p_memsz; 1123 seg->p_memsz = phdr->p_memsz;
1094 1124
1095 /* map the ELF header address 1125 /* map the ELF header address if in this segment */
1096 if (phdr->p_offset == 0) 1126 if (phdr->p_offset == 0)
1097 params->elfhdr_addr = 1127 params->elfhdr_addr = seg->addr;
1098 1128
1099 /* clear the bit between begi 1129 /* clear the bit between beginning of mapping and beginning of
1100 * PT_LOAD */ 1130 * PT_LOAD */
1101 if (prot & PROT_WRITE && disp 1131 if (prot & PROT_WRITE && disp > 0) {
1102 kdebug("clear[%d] ad= 1132 kdebug("clear[%d] ad=%lx sz=%lx", loop, maddr, disp);
1103 if (clear_user((void 1133 if (clear_user((void __user *) maddr, disp))
1104 return -EFAUL 1134 return -EFAULT;
1105 maddr += disp; 1135 maddr += disp;
1106 } 1136 }
1107 1137
1108 /* clear any space allocated 1138 /* clear any space allocated but not loaded
1109 * - on uClinux we can just c 1139 * - on uClinux we can just clear the lot
1110 * - on MMU linux we'll get a 1140 * - on MMU linux we'll get a SIGBUS beyond the last page
1111 * extant in the file 1141 * extant in the file
1112 */ 1142 */
1113 excess = phdr->p_memsz - phdr 1143 excess = phdr->p_memsz - phdr->p_filesz;
1114 excess1 = PAGE_SIZE - ((maddr 1144 excess1 = PAGE_SIZE - ((maddr + phdr->p_filesz) & ~PAGE_MASK);
1115 1145
1116 #ifdef CONFIG_MMU 1146 #ifdef CONFIG_MMU
1117 if (excess > excess1) { 1147 if (excess > excess1) {
1118 unsigned long xaddr = 1148 unsigned long xaddr = maddr + phdr->p_filesz + excess1;
1119 unsigned long xmaddr; 1149 unsigned long xmaddr;
1120 1150
1121 flags |= MAP_FIXED | 1151 flags |= MAP_FIXED | MAP_ANONYMOUS;
1122 xmaddr = vm_mmap(NULL 1152 xmaddr = vm_mmap(NULL, xaddr, excess - excess1,
1123 prot 1153 prot, flags, 0);
1124 1154
1125 kdebug("mmap[%d] <ano 1155 kdebug("mmap[%d] <anon>"
1126 " ad=%lx sz=%l 1156 " ad=%lx sz=%lx pr=%x fl=%x of=0 --> %08lx",
1127 loop, xaddr, e 1157 loop, xaddr, excess - excess1, prot, flags,
1128 xmaddr); 1158 xmaddr);
1129 1159
1130 if (xmaddr != xaddr) 1160 if (xmaddr != xaddr)
1131 return -ENOME 1161 return -ENOMEM;
1132 } 1162 }
1133 1163
1134 if (prot & PROT_WRITE && exce 1164 if (prot & PROT_WRITE && excess1 > 0) {
1135 kdebug("clear[%d] ad= 1165 kdebug("clear[%d] ad=%lx sz=%lx",
1136 loop, maddr + 1166 loop, maddr + phdr->p_filesz, excess1);
1137 if (clear_user((void 1167 if (clear_user((void __user *) maddr + phdr->p_filesz,
1138 excess 1168 excess1))
1139 return -EFAUL 1169 return -EFAULT;
1140 } 1170 }
1141 1171
1142 #else 1172 #else
1143 if (excess > 0) { 1173 if (excess > 0) {
1144 kdebug("clear[%d] ad= !! 1174 kdebug("clear[%d] ad=%lx sz=%lx",
1145 (unsigned long !! 1175 loop, maddr + phdr->p_filesz, excess);
1146 excess); <<
1147 if (clear_user((void 1176 if (clear_user((void *) maddr + phdr->p_filesz, excess))
1148 return -EFAUL 1177 return -EFAULT;
1149 } 1178 }
1150 #endif 1179 #endif
1151 1180
1152 if (mm) { 1181 if (mm) {
1153 if (phdr->p_flags & P 1182 if (phdr->p_flags & PF_X) {
1154 if (!mm->star 1183 if (!mm->start_code) {
1155 mm->s 1184 mm->start_code = maddr;
1156 mm->e 1185 mm->end_code = maddr + phdr->p_memsz;
1157 } 1186 }
1158 } else if (!mm->start 1187 } else if (!mm->start_data) {
1159 mm->start_dat 1188 mm->start_data = maddr;
1160 mm->end_data 1189 mm->end_data = maddr + phdr->p_memsz;
1161 } 1190 }
1162 } 1191 }
1163 1192
1164 seg++; 1193 seg++;
1165 } 1194 }
1166 1195
1167 return 0; 1196 return 0;
1168 } 1197 }
1169 1198
1170 /******************************************** 1199 /*****************************************************************************/
1171 /* 1200 /*
1172 * ELF-FDPIC core dumper 1201 * ELF-FDPIC core dumper
1173 * 1202 *
1174 * Modelled on fs/exec.c:aout_core_dump() 1203 * Modelled on fs/exec.c:aout_core_dump()
1175 * Jeremy Fitzhardinge <jeremy@sw.oz.au> 1204 * Jeremy Fitzhardinge <jeremy@sw.oz.au>
1176 * 1205 *
1177 * Modelled on fs/binfmt_elf.c core dumper 1206 * Modelled on fs/binfmt_elf.c core dumper
1178 */ 1207 */
1179 #ifdef CONFIG_ELF_CORE 1208 #ifdef CONFIG_ELF_CORE
1180 1209
1181 struct elf_prstatus_fdpic !! 1210 /*
>> 1211 * Decide whether a segment is worth dumping; default is yes to be
>> 1212 * sure (missing info is worse than too much; etc).
>> 1213 * Personally I'd include everything, and use the coredump limit...
>> 1214 *
>> 1215 * I think we should skip something. But I am not sure how. H.J.
>> 1216 */
>> 1217 static int maydump(struct vm_area_struct *vma, unsigned long mm_flags)
1182 { 1218 {
1183 struct elf_prstatus_common commo !! 1219 int dump_ok;
1184 elf_gregset_t pr_reg; /* GP registe !! 1220
1185 /* When using FDPIC, the loadmap addr !! 1221 /* Do not dump I/O mapped devices or special mappings */
1186 * to GDB in order for GDB to do the !! 1222 if (vma->vm_flags & VM_IO) {
1187 * fields (below) used to communicate !! 1223 kdcore("%08lx: %08lx: no (IO)", vma->vm_start, vma->vm_flags);
1188 * immediately after ``pr_reg'', so t !! 1224 return 0;
1189 * be viewed as part of the register !! 1225 }
>> 1226
>> 1227 /* If we may not read the contents, don't allow us to dump
>> 1228 * them either. "dump_write()" can't handle it anyway.
1190 */ 1229 */
1191 unsigned long pr_exec_fdpic_loadmap; !! 1230 if (!(vma->vm_flags & VM_READ)) {
1192 unsigned long pr_interp_fdpic_loadmap !! 1231 kdcore("%08lx: %08lx: no (!read)", vma->vm_start, vma->vm_flags);
1193 int pr_fpvalid; /* True if ma !! 1232 return 0;
1194 }; !! 1233 }
>> 1234
>> 1235 /* support for DAX */
>> 1236 if (vma_is_dax(vma)) {
>> 1237 if (vma->vm_flags & VM_SHARED) {
>> 1238 dump_ok = test_bit(MMF_DUMP_DAX_SHARED, &mm_flags);
>> 1239 kdcore("%08lx: %08lx: %s (DAX shared)", vma->vm_start,
>> 1240 vma->vm_flags, dump_ok ? "yes" : "no");
>> 1241 } else {
>> 1242 dump_ok = test_bit(MMF_DUMP_DAX_PRIVATE, &mm_flags);
>> 1243 kdcore("%08lx: %08lx: %s (DAX private)", vma->vm_start,
>> 1244 vma->vm_flags, dump_ok ? "yes" : "no");
>> 1245 }
>> 1246 return dump_ok;
>> 1247 }
>> 1248
>> 1249 /* By default, dump shared memory if mapped from an anonymous file. */
>> 1250 if (vma->vm_flags & VM_SHARED) {
>> 1251 if (file_inode(vma->vm_file)->i_nlink == 0) {
>> 1252 dump_ok = test_bit(MMF_DUMP_ANON_SHARED, &mm_flags);
>> 1253 kdcore("%08lx: %08lx: %s (share)", vma->vm_start,
>> 1254 vma->vm_flags, dump_ok ? "yes" : "no");
>> 1255 return dump_ok;
>> 1256 }
>> 1257
>> 1258 dump_ok = test_bit(MMF_DUMP_MAPPED_SHARED, &mm_flags);
>> 1259 kdcore("%08lx: %08lx: %s (share)", vma->vm_start,
>> 1260 vma->vm_flags, dump_ok ? "yes" : "no");
>> 1261 return dump_ok;
>> 1262 }
>> 1263
>> 1264 #ifdef CONFIG_MMU
>> 1265 /* By default, if it hasn't been written to, don't write it out */
>> 1266 if (!vma->anon_vma) {
>> 1267 dump_ok = test_bit(MMF_DUMP_MAPPED_PRIVATE, &mm_flags);
>> 1268 kdcore("%08lx: %08lx: %s (!anon)", vma->vm_start,
>> 1269 vma->vm_flags, dump_ok ? "yes" : "no");
>> 1270 return dump_ok;
>> 1271 }
>> 1272 #endif
>> 1273
>> 1274 dump_ok = test_bit(MMF_DUMP_ANON_PRIVATE, &mm_flags);
>> 1275 kdcore("%08lx: %08lx: %s", vma->vm_start, vma->vm_flags,
>> 1276 dump_ok ? "yes" : "no");
>> 1277 return dump_ok;
>> 1278 }
1195 1279
1196 /* An ELF note in memory */ 1280 /* An ELF note in memory */
1197 struct memelfnote 1281 struct memelfnote
1198 { 1282 {
1199 const char *name; 1283 const char *name;
1200 int type; 1284 int type;
1201 unsigned int datasz; 1285 unsigned int datasz;
1202 void *data; 1286 void *data;
1203 }; 1287 };
1204 1288
1205 static int notesize(struct memelfnote *en) 1289 static int notesize(struct memelfnote *en)
1206 { 1290 {
1207 int sz; 1291 int sz;
1208 1292
1209 sz = sizeof(struct elf_note); 1293 sz = sizeof(struct elf_note);
1210 sz += roundup(strlen(en->name) + 1, 4 1294 sz += roundup(strlen(en->name) + 1, 4);
1211 sz += roundup(en->datasz, 4); 1295 sz += roundup(en->datasz, 4);
1212 1296
1213 return sz; 1297 return sz;
1214 } 1298 }
1215 1299
1216 /* #define DEBUG */ 1300 /* #define DEBUG */
1217 1301
1218 static int writenote(struct memelfnote *men, 1302 static int writenote(struct memelfnote *men, struct coredump_params *cprm)
1219 { 1303 {
1220 struct elf_note en; 1304 struct elf_note en;
1221 en.n_namesz = strlen(men->name) + 1; 1305 en.n_namesz = strlen(men->name) + 1;
1222 en.n_descsz = men->datasz; 1306 en.n_descsz = men->datasz;
1223 en.n_type = men->type; 1307 en.n_type = men->type;
1224 1308
1225 return dump_emit(cprm, &en, sizeof(en 1309 return dump_emit(cprm, &en, sizeof(en)) &&
1226 dump_emit(cprm, men->name, en 1310 dump_emit(cprm, men->name, en.n_namesz) && dump_align(cprm, 4) &&
1227 dump_emit(cprm, men->data, me 1311 dump_emit(cprm, men->data, men->datasz) && dump_align(cprm, 4);
1228 } 1312 }
1229 1313
1230 static inline void fill_elf_fdpic_header(stru 1314 static inline void fill_elf_fdpic_header(struct elfhdr *elf, int segs)
1231 { 1315 {
1232 memcpy(elf->e_ident, ELFMAG, SELFMAG) 1316 memcpy(elf->e_ident, ELFMAG, SELFMAG);
1233 elf->e_ident[EI_CLASS] = ELF_CLASS; 1317 elf->e_ident[EI_CLASS] = ELF_CLASS;
1234 elf->e_ident[EI_DATA] = ELF_DATA; 1318 elf->e_ident[EI_DATA] = ELF_DATA;
1235 elf->e_ident[EI_VERSION] = EV_CURRENT 1319 elf->e_ident[EI_VERSION] = EV_CURRENT;
1236 elf->e_ident[EI_OSABI] = ELF_OSABI; 1320 elf->e_ident[EI_OSABI] = ELF_OSABI;
1237 memset(elf->e_ident+EI_PAD, 0, EI_NID 1321 memset(elf->e_ident+EI_PAD, 0, EI_NIDENT-EI_PAD);
1238 1322
1239 elf->e_type = ET_CORE; 1323 elf->e_type = ET_CORE;
1240 elf->e_machine = ELF_ARCH; 1324 elf->e_machine = ELF_ARCH;
1241 elf->e_version = EV_CURRENT; 1325 elf->e_version = EV_CURRENT;
1242 elf->e_entry = 0; 1326 elf->e_entry = 0;
1243 elf->e_phoff = sizeof(struct elfhdr); 1327 elf->e_phoff = sizeof(struct elfhdr);
1244 elf->e_shoff = 0; 1328 elf->e_shoff = 0;
1245 elf->e_flags = ELF_FDPIC_CORE_EFLAGS; 1329 elf->e_flags = ELF_FDPIC_CORE_EFLAGS;
1246 elf->e_ehsize = sizeof(struct elfhdr) 1330 elf->e_ehsize = sizeof(struct elfhdr);
1247 elf->e_phentsize = sizeof(struct elf_ 1331 elf->e_phentsize = sizeof(struct elf_phdr);
1248 elf->e_phnum = segs; 1332 elf->e_phnum = segs;
1249 elf->e_shentsize = 0; 1333 elf->e_shentsize = 0;
1250 elf->e_shnum = 0; 1334 elf->e_shnum = 0;
1251 elf->e_shstrndx = 0; 1335 elf->e_shstrndx = 0;
1252 return; 1336 return;
1253 } 1337 }
1254 1338
1255 static inline void fill_elf_note_phdr(struct 1339 static inline void fill_elf_note_phdr(struct elf_phdr *phdr, int sz, loff_t offset)
1256 { 1340 {
1257 phdr->p_type = PT_NOTE; 1341 phdr->p_type = PT_NOTE;
1258 phdr->p_offset = offset; 1342 phdr->p_offset = offset;
1259 phdr->p_vaddr = 0; 1343 phdr->p_vaddr = 0;
1260 phdr->p_paddr = 0; 1344 phdr->p_paddr = 0;
1261 phdr->p_filesz = sz; 1345 phdr->p_filesz = sz;
1262 phdr->p_memsz = 0; 1346 phdr->p_memsz = 0;
1263 phdr->p_flags = 0; 1347 phdr->p_flags = 0;
1264 phdr->p_align = 4; !! 1348 phdr->p_align = 0;
1265 return; 1349 return;
1266 } 1350 }
1267 1351
1268 static inline void fill_note(struct memelfnot 1352 static inline void fill_note(struct memelfnote *note, const char *name, int type,
1269 unsigned int sz, void *data) 1353 unsigned int sz, void *data)
1270 { 1354 {
1271 note->name = name; 1355 note->name = name;
1272 note->type = type; 1356 note->type = type;
1273 note->datasz = sz; 1357 note->datasz = sz;
1274 note->data = data; 1358 note->data = data;
1275 return; 1359 return;
1276 } 1360 }
1277 1361
1278 /* 1362 /*
1279 * fill up all the fields in prstatus from th 1363 * fill up all the fields in prstatus from the given task struct, except
1280 * registers which need to be filled up separ 1364 * registers which need to be filled up separately.
1281 */ 1365 */
1282 static void fill_prstatus(struct elf_prstatus !! 1366 static void fill_prstatus(struct elf_prstatus *prstatus,
1283 struct task_struct 1367 struct task_struct *p, long signr)
1284 { 1368 {
1285 prstatus->pr_info.si_signo = prstatus 1369 prstatus->pr_info.si_signo = prstatus->pr_cursig = signr;
1286 prstatus->pr_sigpend = p->pending.sig 1370 prstatus->pr_sigpend = p->pending.signal.sig[0];
1287 prstatus->pr_sighold = p->blocked.sig 1371 prstatus->pr_sighold = p->blocked.sig[0];
1288 rcu_read_lock(); 1372 rcu_read_lock();
1289 prstatus->pr_ppid = task_pid_vnr(rcu_ 1373 prstatus->pr_ppid = task_pid_vnr(rcu_dereference(p->real_parent));
1290 rcu_read_unlock(); 1374 rcu_read_unlock();
1291 prstatus->pr_pid = task_pid_vnr(p); 1375 prstatus->pr_pid = task_pid_vnr(p);
1292 prstatus->pr_pgrp = task_pgrp_vnr(p); 1376 prstatus->pr_pgrp = task_pgrp_vnr(p);
1293 prstatus->pr_sid = task_session_vnr(p 1377 prstatus->pr_sid = task_session_vnr(p);
1294 if (thread_group_leader(p)) { 1378 if (thread_group_leader(p)) {
1295 struct task_cputime cputime; 1379 struct task_cputime cputime;
1296 1380
1297 /* 1381 /*
1298 * This is the record for the 1382 * This is the record for the group leader. It shows the
1299 * group-wide total, not its 1383 * group-wide total, not its individual thread total.
1300 */ 1384 */
1301 thread_group_cputime(p, &cput 1385 thread_group_cputime(p, &cputime);
1302 prstatus->pr_utime = ns_to_ke !! 1386 cputime_to_timeval(cputime.utime, &prstatus->pr_utime);
1303 prstatus->pr_stime = ns_to_ke !! 1387 cputime_to_timeval(cputime.stime, &prstatus->pr_stime);
1304 } else { 1388 } else {
1305 u64 utime, stime; !! 1389 cputime_t utime, stime;
1306 1390
1307 task_cputime(p, &utime, &stim 1391 task_cputime(p, &utime, &stime);
1308 prstatus->pr_utime = ns_to_ke !! 1392 cputime_to_timeval(utime, &prstatus->pr_utime);
1309 prstatus->pr_stime = ns_to_ke !! 1393 cputime_to_timeval(stime, &prstatus->pr_stime);
1310 } 1394 }
1311 prstatus->pr_cutime = ns_to_kernel_ol !! 1395 cputime_to_timeval(p->signal->cutime, &prstatus->pr_cutime);
1312 prstatus->pr_cstime = ns_to_kernel_ol !! 1396 cputime_to_timeval(p->signal->cstime, &prstatus->pr_cstime);
>> 1397
>> 1398 prstatus->pr_exec_fdpic_loadmap = p->mm->context.exec_fdpic_loadmap;
>> 1399 prstatus->pr_interp_fdpic_loadmap = p->mm->context.interp_fdpic_loadmap;
1313 } 1400 }
1314 1401
1315 static int fill_psinfo(struct elf_prpsinfo *p 1402 static int fill_psinfo(struct elf_prpsinfo *psinfo, struct task_struct *p,
1316 struct mm_struct *mm) 1403 struct mm_struct *mm)
1317 { 1404 {
1318 const struct cred *cred; 1405 const struct cred *cred;
1319 unsigned int i, len; 1406 unsigned int i, len;
1320 unsigned int state; <<
1321 1407
1322 /* first copy the parameters from use 1408 /* first copy the parameters from user space */
1323 memset(psinfo, 0, sizeof(struct elf_p 1409 memset(psinfo, 0, sizeof(struct elf_prpsinfo));
1324 1410
1325 len = mm->arg_end - mm->arg_start; 1411 len = mm->arg_end - mm->arg_start;
1326 if (len >= ELF_PRARGSZ) 1412 if (len >= ELF_PRARGSZ)
1327 len = ELF_PRARGSZ - 1; 1413 len = ELF_PRARGSZ - 1;
1328 if (copy_from_user(&psinfo->pr_psargs 1414 if (copy_from_user(&psinfo->pr_psargs,
1329 (const char __user 1415 (const char __user *) mm->arg_start, len))
1330 return -EFAULT; 1416 return -EFAULT;
1331 for (i = 0; i < len; i++) 1417 for (i = 0; i < len; i++)
1332 if (psinfo->pr_psargs[i] == 0 1418 if (psinfo->pr_psargs[i] == 0)
1333 psinfo->pr_psargs[i] 1419 psinfo->pr_psargs[i] = ' ';
1334 psinfo->pr_psargs[len] = 0; 1420 psinfo->pr_psargs[len] = 0;
1335 1421
1336 rcu_read_lock(); 1422 rcu_read_lock();
1337 psinfo->pr_ppid = task_pid_vnr(rcu_de 1423 psinfo->pr_ppid = task_pid_vnr(rcu_dereference(p->real_parent));
1338 rcu_read_unlock(); 1424 rcu_read_unlock();
1339 psinfo->pr_pid = task_pid_vnr(p); 1425 psinfo->pr_pid = task_pid_vnr(p);
1340 psinfo->pr_pgrp = task_pgrp_vnr(p); 1426 psinfo->pr_pgrp = task_pgrp_vnr(p);
1341 psinfo->pr_sid = task_session_vnr(p); 1427 psinfo->pr_sid = task_session_vnr(p);
1342 1428
1343 state = READ_ONCE(p->__state); !! 1429 i = p->state ? ffz(~p->state) + 1 : 0;
1344 i = state ? ffz(~state) + 1 : 0; <<
1345 psinfo->pr_state = i; 1430 psinfo->pr_state = i;
1346 psinfo->pr_sname = (i > 5) ? '.' : "R 1431 psinfo->pr_sname = (i > 5) ? '.' : "RSDTZW"[i];
1347 psinfo->pr_zomb = psinfo->pr_sname == 1432 psinfo->pr_zomb = psinfo->pr_sname == 'Z';
1348 psinfo->pr_nice = task_nice(p); 1433 psinfo->pr_nice = task_nice(p);
1349 psinfo->pr_flag = p->flags; 1434 psinfo->pr_flag = p->flags;
1350 rcu_read_lock(); 1435 rcu_read_lock();
1351 cred = __task_cred(p); 1436 cred = __task_cred(p);
1352 SET_UID(psinfo->pr_uid, from_kuid_mun 1437 SET_UID(psinfo->pr_uid, from_kuid_munged(cred->user_ns, cred->uid));
1353 SET_GID(psinfo->pr_gid, from_kgid_mun 1438 SET_GID(psinfo->pr_gid, from_kgid_munged(cred->user_ns, cred->gid));
1354 rcu_read_unlock(); 1439 rcu_read_unlock();
1355 get_task_comm(psinfo->pr_fname, p); !! 1440 strncpy(psinfo->pr_fname, p->comm, sizeof(psinfo->pr_fname));
1356 1441
1357 return 0; 1442 return 0;
1358 } 1443 }
1359 1444
1360 /* Here is the structure in which status of e 1445 /* Here is the structure in which status of each thread is captured. */
1361 struct elf_thread_status 1446 struct elf_thread_status
1362 { 1447 {
1363 struct elf_thread_status *next; !! 1448 struct list_head list;
1364 struct elf_prstatus_fdpic prstatus; !! 1449 struct elf_prstatus prstatus; /* NT_PRSTATUS */
1365 elf_fpregset_t fpu; /* NT 1450 elf_fpregset_t fpu; /* NT_PRFPREG */
1366 struct memelfnote notes[2]; !! 1451 struct task_struct *thread;
>> 1452 #ifdef ELF_CORE_COPY_XFPREGS
>> 1453 elf_fpxregset_t xfpu; /* ELF_CORE_XFPREG_TYPE */
>> 1454 #endif
>> 1455 struct memelfnote notes[3];
1367 int num_notes; 1456 int num_notes;
1368 }; 1457 };
1369 1458
1370 /* 1459 /*
1371 * In order to add the specific thread inform 1460 * In order to add the specific thread information for the elf file format,
1372 * we need to keep a linked list of every thr 1461 * we need to keep a linked list of every thread's pr_status and then create
1373 * a single section for them in the final cor 1462 * a single section for them in the final core file.
1374 */ 1463 */
1375 static struct elf_thread_status *elf_dump_thr !! 1464 static int elf_dump_thread_status(long signr, struct elf_thread_status *t)
1376 { 1465 {
1377 const struct user_regset_view *view = !! 1466 struct task_struct *p = t->thread;
1378 struct elf_thread_status *t; !! 1467 int sz = 0;
1379 int i, ret; !! 1468
1380 !! 1469 t->num_notes = 0;
1381 t = kzalloc(sizeof(struct elf_thread_ !! 1470
1382 if (!t) !! 1471 fill_prstatus(&t->prstatus, p, signr);
1383 return t; !! 1472 elf_core_copy_task_regs(p, &t->prstatus.pr_reg);
1384 <<
1385 fill_prstatus(&t->prstatus.common, p, <<
1386 t->prstatus.pr_exec_fdpic_loadmap = p <<
1387 t->prstatus.pr_interp_fdpic_loadmap = <<
1388 regset_get(p, &view->regsets[0], <<
1389 sizeof(t->prstatus.pr_reg) <<
1390 1473
1391 fill_note(&t->notes[0], "CORE", NT_PR 1474 fill_note(&t->notes[0], "CORE", NT_PRSTATUS, sizeof(t->prstatus),
1392 &t->prstatus); 1475 &t->prstatus);
1393 t->num_notes++; 1476 t->num_notes++;
1394 *sz += notesize(&t->notes[0]); !! 1477 sz += notesize(&t->notes[0]);
1395 <<
1396 for (i = 1; i < view->n; ++i) { <<
1397 const struct user_regset *reg <<
1398 if (regset->core_note_type != <<
1399 continue; <<
1400 if (regset->active && regset- <<
1401 continue; <<
1402 ret = regset_get(p, regset, s <<
1403 if (ret >= 0) <<
1404 t->prstatus.pr_fpvali <<
1405 break; <<
1406 } <<
1407 1478
>> 1479 t->prstatus.pr_fpvalid = elf_core_copy_task_fpregs(p, NULL, &t->fpu);
1408 if (t->prstatus.pr_fpvalid) { 1480 if (t->prstatus.pr_fpvalid) {
1409 fill_note(&t->notes[1], "CORE 1481 fill_note(&t->notes[1], "CORE", NT_PRFPREG, sizeof(t->fpu),
1410 &t->fpu); 1482 &t->fpu);
1411 t->num_notes++; 1483 t->num_notes++;
1412 *sz += notesize(&t->notes[1]) !! 1484 sz += notesize(&t->notes[1]);
1413 } 1485 }
1414 return t; !! 1486
>> 1487 #ifdef ELF_CORE_COPY_XFPREGS
>> 1488 if (elf_core_copy_task_xfpregs(p, &t->xfpu)) {
>> 1489 fill_note(&t->notes[2], "LINUX", ELF_CORE_XFPREG_TYPE,
>> 1490 sizeof(t->xfpu), &t->xfpu);
>> 1491 t->num_notes++;
>> 1492 sz += notesize(&t->notes[2]);
>> 1493 }
>> 1494 #endif
>> 1495 return sz;
1415 } 1496 }
1416 1497
1417 static void fill_extnum_info(struct elfhdr *e 1498 static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
1418 elf_addr_t e_sho 1499 elf_addr_t e_shoff, int segs)
1419 { 1500 {
1420 elf->e_shoff = e_shoff; 1501 elf->e_shoff = e_shoff;
1421 elf->e_shentsize = sizeof(*shdr4extnu 1502 elf->e_shentsize = sizeof(*shdr4extnum);
1422 elf->e_shnum = 1; 1503 elf->e_shnum = 1;
1423 elf->e_shstrndx = SHN_UNDEF; 1504 elf->e_shstrndx = SHN_UNDEF;
1424 1505
1425 memset(shdr4extnum, 0, sizeof(*shdr4e 1506 memset(shdr4extnum, 0, sizeof(*shdr4extnum));
1426 1507
1427 shdr4extnum->sh_type = SHT_NULL; 1508 shdr4extnum->sh_type = SHT_NULL;
1428 shdr4extnum->sh_size = elf->e_shnum; 1509 shdr4extnum->sh_size = elf->e_shnum;
1429 shdr4extnum->sh_link = elf->e_shstrnd 1510 shdr4extnum->sh_link = elf->e_shstrndx;
1430 shdr4extnum->sh_info = segs; 1511 shdr4extnum->sh_info = segs;
1431 } 1512 }
1432 1513
1433 /* 1514 /*
1434 * dump the segments for an MMU process 1515 * dump the segments for an MMU process
1435 */ 1516 */
1436 static bool elf_fdpic_dump_segments(struct co !! 1517 static bool elf_fdpic_dump_segments(struct coredump_params *cprm)
1437 struct co <<
1438 int vma_c <<
1439 { 1518 {
1440 int i; !! 1519 struct vm_area_struct *vma;
1441 1520
1442 for (i = 0; i < vma_count; i++) { !! 1521 for (vma = current->mm->mmap; vma; vma = vma->vm_next) {
1443 struct core_vma_metadata *met !! 1522 unsigned long addr;
1444 1523
1445 if (!dump_user_range(cprm, me !! 1524 if (!maydump(vma, cprm->mm_flags))
>> 1525 continue;
>> 1526
>> 1527 #ifdef CONFIG_MMU
>> 1528 for (addr = vma->vm_start; addr < vma->vm_end;
>> 1529 addr += PAGE_SIZE) {
>> 1530 bool res;
>> 1531 struct page *page = get_dump_page(addr);
>> 1532 if (page) {
>> 1533 void *kaddr = kmap(page);
>> 1534 res = dump_emit(cprm, kaddr, PAGE_SIZE);
>> 1535 kunmap(page);
>> 1536 page_cache_release(page);
>> 1537 } else {
>> 1538 res = dump_skip(cprm, PAGE_SIZE);
>> 1539 }
>> 1540 if (!res)
>> 1541 return false;
>> 1542 }
>> 1543 #else
>> 1544 if (!dump_emit(cprm, (void *) vma->vm_start,
>> 1545 vma->vm_end - vma->vm_start))
1446 return false; 1546 return false;
>> 1547 #endif
1447 } 1548 }
1448 return true; 1549 return true;
1449 } 1550 }
1450 1551
>> 1552 static size_t elf_core_vma_data_size(unsigned long mm_flags)
>> 1553 {
>> 1554 struct vm_area_struct *vma;
>> 1555 size_t size = 0;
>> 1556
>> 1557 for (vma = current->mm->mmap; vma; vma = vma->vm_next)
>> 1558 if (maydump(vma, mm_flags))
>> 1559 size += vma->vm_end - vma->vm_start;
>> 1560 return size;
>> 1561 }
>> 1562
1451 /* 1563 /*
1452 * Actual dumper 1564 * Actual dumper
1453 * 1565 *
1454 * This is a two-pass process; first we find 1566 * This is a two-pass process; first we find the offsets of the bits,
1455 * and then they are actually written out. I 1567 * and then they are actually written out. If we run out of core limit
1456 * we just truncate. 1568 * we just truncate.
1457 */ 1569 */
1458 static int elf_fdpic_core_dump(struct coredum 1570 static int elf_fdpic_core_dump(struct coredump_params *cprm)
1459 { 1571 {
>> 1572 #define NUM_NOTES 6
1460 int has_dumped = 0; 1573 int has_dumped = 0;
>> 1574 mm_segment_t fs;
1461 int segs; 1575 int segs;
1462 int i; 1576 int i;
>> 1577 struct vm_area_struct *vma;
1463 struct elfhdr *elf = NULL; 1578 struct elfhdr *elf = NULL;
1464 loff_t offset = 0, dataoff; 1579 loff_t offset = 0, dataoff;
1465 struct memelfnote psinfo_note, auxv_n !! 1580 int numnote;
>> 1581 struct memelfnote *notes = NULL;
>> 1582 struct elf_prstatus *prstatus = NULL; /* NT_PRSTATUS */
1466 struct elf_prpsinfo *psinfo = NULL; 1583 struct elf_prpsinfo *psinfo = NULL; /* NT_PRPSINFO */
1467 struct elf_thread_status *thread_list !! 1584 LIST_HEAD(thread_list);
>> 1585 struct list_head *t;
>> 1586 elf_fpregset_t *fpu = NULL;
>> 1587 #ifdef ELF_CORE_COPY_XFPREGS
>> 1588 elf_fpxregset_t *xfpu = NULL;
>> 1589 #endif
1468 int thread_status_size = 0; 1590 int thread_status_size = 0;
1469 elf_addr_t *auxv; 1591 elf_addr_t *auxv;
1470 struct elf_phdr *phdr4note = NULL; 1592 struct elf_phdr *phdr4note = NULL;
1471 struct elf_shdr *shdr4extnum = NULL; 1593 struct elf_shdr *shdr4extnum = NULL;
1472 Elf_Half e_phnum; 1594 Elf_Half e_phnum;
1473 elf_addr_t e_shoff; 1595 elf_addr_t e_shoff;
1474 struct core_thread *ct; 1596 struct core_thread *ct;
1475 struct elf_thread_status *tmp; 1597 struct elf_thread_status *tmp;
1476 1598
>> 1599 /*
>> 1600 * We no longer stop all VM operations.
>> 1601 *
>> 1602 * This is because those proceses that could possibly change map_count
>> 1603 * or the mmap / vma pages are now blocked in do_exit on current
>> 1604 * finishing this core dump.
>> 1605 *
>> 1606 * Only ptrace can touch these memory addresses, but it doesn't change
>> 1607 * the map_count or the pages allocated. So no possibility of crashing
>> 1608 * exists while dumping the mm->vm_next areas to the core file.
>> 1609 */
>> 1610
1477 /* alloc memory for large data struct 1611 /* alloc memory for large data structures: too large to be on stack */
1478 elf = kmalloc(sizeof(*elf), GFP_KERNE 1612 elf = kmalloc(sizeof(*elf), GFP_KERNEL);
1479 if (!elf) 1613 if (!elf)
1480 goto end_coredump; !! 1614 goto cleanup;
>> 1615 prstatus = kzalloc(sizeof(*prstatus), GFP_KERNEL);
>> 1616 if (!prstatus)
>> 1617 goto cleanup;
1481 psinfo = kmalloc(sizeof(*psinfo), GFP 1618 psinfo = kmalloc(sizeof(*psinfo), GFP_KERNEL);
1482 if (!psinfo) 1619 if (!psinfo)
1483 goto end_coredump; !! 1620 goto cleanup;
>> 1621 notes = kmalloc(NUM_NOTES * sizeof(struct memelfnote), GFP_KERNEL);
>> 1622 if (!notes)
>> 1623 goto cleanup;
>> 1624 fpu = kmalloc(sizeof(*fpu), GFP_KERNEL);
>> 1625 if (!fpu)
>> 1626 goto cleanup;
>> 1627 #ifdef ELF_CORE_COPY_XFPREGS
>> 1628 xfpu = kmalloc(sizeof(*xfpu), GFP_KERNEL);
>> 1629 if (!xfpu)
>> 1630 goto cleanup;
>> 1631 #endif
1484 1632
1485 for (ct = current->signal->core_state !! 1633 for (ct = current->mm->core_state->dumper.next;
1486 ct; c 1634 ct; ct = ct->next) {
1487 tmp = elf_dump_thread_status( !! 1635 tmp = kzalloc(sizeof(*tmp), GFP_KERNEL);
1488 <<
1489 if (!tmp) 1636 if (!tmp)
1490 goto end_coredump; !! 1637 goto cleanup;
1491 1638
1492 tmp->next = thread_list; !! 1639 tmp->thread = ct->task;
1493 thread_list = tmp; !! 1640 list_add(&tmp->list, &thread_list);
>> 1641 }
>> 1642
>> 1643 list_for_each(t, &thread_list) {
>> 1644 struct elf_thread_status *tmp;
>> 1645 int sz;
>> 1646
>> 1647 tmp = list_entry(t, struct elf_thread_status, list);
>> 1648 sz = elf_dump_thread_status(cprm->siginfo->si_signo, tmp);
>> 1649 thread_status_size += sz;
1494 } 1650 }
1495 1651
1496 /* now collect the dump for the curre 1652 /* now collect the dump for the current */
1497 tmp = elf_dump_thread_status(cprm->si !! 1653 fill_prstatus(prstatus, current, cprm->siginfo->si_signo);
1498 current, !! 1654 elf_core_copy_regs(&prstatus->pr_reg, cprm->regs);
1499 if (!tmp) <<
1500 goto end_coredump; <<
1501 tmp->next = thread_list; <<
1502 thread_list = tmp; <<
1503 1655
1504 segs = cprm->vma_count + elf_core_ext !! 1656 segs = current->mm->map_count;
>> 1657 segs += elf_core_extra_phdrs();
1505 1658
1506 /* for notes section */ 1659 /* for notes section */
1507 segs++; 1660 segs++;
1508 1661
1509 /* If segs > PN_XNUM(0xffff), then e_ 1662 /* If segs > PN_XNUM(0xffff), then e_phnum overflows. To avoid
1510 * this, kernel supports extended num 1663 * this, kernel supports extended numbering. Have a look at
1511 * include/linux/elf.h for further in 1664 * include/linux/elf.h for further information. */
1512 e_phnum = segs > PN_XNUM ? PN_XNUM : 1665 e_phnum = segs > PN_XNUM ? PN_XNUM : segs;
1513 1666
1514 /* Set up header */ 1667 /* Set up header */
1515 fill_elf_fdpic_header(elf, e_phnum); 1668 fill_elf_fdpic_header(elf, e_phnum);
1516 1669
1517 has_dumped = 1; 1670 has_dumped = 1;
1518 /* 1671 /*
1519 * Set up the notes in similar form t 1672 * Set up the notes in similar form to SVR4 core dumps made
1520 * with info from their /proc. 1673 * with info from their /proc.
1521 */ 1674 */
1522 1675
>> 1676 fill_note(notes + 0, "CORE", NT_PRSTATUS, sizeof(*prstatus), prstatus);
1523 fill_psinfo(psinfo, current->group_le 1677 fill_psinfo(psinfo, current->group_leader, current->mm);
1524 fill_note(&psinfo_note, "CORE", NT_PR !! 1678 fill_note(notes + 1, "CORE", NT_PRPSINFO, sizeof(*psinfo), psinfo);
1525 thread_status_size += notesize(&psinf !! 1679
>> 1680 numnote = 2;
1526 1681
1527 auxv = (elf_addr_t *) current->mm->sa 1682 auxv = (elf_addr_t *) current->mm->saved_auxv;
>> 1683
1528 i = 0; 1684 i = 0;
1529 do 1685 do
1530 i += 2; 1686 i += 2;
1531 while (auxv[i - 2] != AT_NULL); 1687 while (auxv[i - 2] != AT_NULL);
1532 fill_note(&auxv_note, "CORE", NT_AUXV !! 1688 fill_note(¬es[numnote++], "CORE", NT_AUXV,
1533 thread_status_size += notesize(&auxv_ !! 1689 i * sizeof(elf_addr_t), auxv);
>> 1690
>> 1691 /* Try to dump the FPU. */
>> 1692 if ((prstatus->pr_fpvalid =
>> 1693 elf_core_copy_task_fpregs(current, cprm->regs, fpu)))
>> 1694 fill_note(notes + numnote++,
>> 1695 "CORE", NT_PRFPREG, sizeof(*fpu), fpu);
>> 1696 #ifdef ELF_CORE_COPY_XFPREGS
>> 1697 if (elf_core_copy_task_xfpregs(current, xfpu))
>> 1698 fill_note(notes + numnote++,
>> 1699 "LINUX", ELF_CORE_XFPREG_TYPE, sizeof(*xfpu), xfpu);
>> 1700 #endif
1534 1701
1535 offset = sizeof(*elf); !! 1702 fs = get_fs();
>> 1703 set_fs(KERNEL_DS);
>> 1704
>> 1705 offset += sizeof(*elf); /* Elf header */
1536 offset += segs * sizeof(struct elf_ph 1706 offset += segs * sizeof(struct elf_phdr); /* Program headers */
1537 1707
1538 /* Write notes phdr entry */ 1708 /* Write notes phdr entry */
1539 phdr4note = kmalloc(sizeof(*phdr4note !! 1709 {
1540 if (!phdr4note) !! 1710 int sz = 0;
1541 goto end_coredump; <<
1542 1711
1543 fill_elf_note_phdr(phdr4note, thread_ !! 1712 for (i = 0; i < numnote; i++)
1544 offset += thread_status_size; !! 1713 sz += notesize(notes + i);
>> 1714
>> 1715 sz += thread_status_size;
>> 1716
>> 1717 phdr4note = kmalloc(sizeof(*phdr4note), GFP_KERNEL);
>> 1718 if (!phdr4note)
>> 1719 goto end_coredump;
>> 1720
>> 1721 fill_elf_note_phdr(phdr4note, sz, offset);
>> 1722 offset += sz;
>> 1723 }
1545 1724
1546 /* Page-align dumped data */ 1725 /* Page-align dumped data */
1547 dataoff = offset = roundup(offset, EL 1726 dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
1548 1727
1549 offset += cprm->vma_data_size; !! 1728 offset += elf_core_vma_data_size(cprm->mm_flags);
1550 offset += elf_core_extra_data_size(cp !! 1729 offset += elf_core_extra_data_size();
1551 e_shoff = offset; 1730 e_shoff = offset;
1552 1731
1553 if (e_phnum == PN_XNUM) { 1732 if (e_phnum == PN_XNUM) {
1554 shdr4extnum = kmalloc(sizeof( 1733 shdr4extnum = kmalloc(sizeof(*shdr4extnum), GFP_KERNEL);
1555 if (!shdr4extnum) 1734 if (!shdr4extnum)
1556 goto end_coredump; 1735 goto end_coredump;
1557 fill_extnum_info(elf, shdr4ex 1736 fill_extnum_info(elf, shdr4extnum, e_shoff, segs);
1558 } 1737 }
1559 1738
1560 offset = dataoff; 1739 offset = dataoff;
1561 1740
1562 if (!dump_emit(cprm, elf, sizeof(*elf 1741 if (!dump_emit(cprm, elf, sizeof(*elf)))
1563 goto end_coredump; 1742 goto end_coredump;
1564 1743
1565 if (!dump_emit(cprm, phdr4note, sizeo 1744 if (!dump_emit(cprm, phdr4note, sizeof(*phdr4note)))
1566 goto end_coredump; 1745 goto end_coredump;
1567 1746
1568 /* write program headers for segments 1747 /* write program headers for segments dump */
1569 for (i = 0; i < cprm->vma_count; i++) !! 1748 for (vma = current->mm->mmap; vma; vma = vma->vm_next) {
1570 struct core_vma_metadata *met <<
1571 struct elf_phdr phdr; 1749 struct elf_phdr phdr;
1572 size_t sz; 1750 size_t sz;
1573 1751
1574 sz = meta->end - meta->start; !! 1752 sz = vma->vm_end - vma->vm_start;
1575 1753
1576 phdr.p_type = PT_LOAD; 1754 phdr.p_type = PT_LOAD;
1577 phdr.p_offset = offset; 1755 phdr.p_offset = offset;
1578 phdr.p_vaddr = meta->start; !! 1756 phdr.p_vaddr = vma->vm_start;
1579 phdr.p_paddr = 0; 1757 phdr.p_paddr = 0;
1580 phdr.p_filesz = meta->dump_si !! 1758 phdr.p_filesz = maydump(vma, cprm->mm_flags) ? sz : 0;
1581 phdr.p_memsz = sz; 1759 phdr.p_memsz = sz;
1582 offset += phdr.p_filesz; 1760 offset += phdr.p_filesz;
1583 phdr.p_flags = 0; !! 1761 phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
1584 if (meta->flags & VM_READ) !! 1762 if (vma->vm_flags & VM_WRITE)
1585 phdr.p_flags |= PF_R; <<
1586 if (meta->flags & VM_WRITE) <<
1587 phdr.p_flags |= PF_W; 1763 phdr.p_flags |= PF_W;
1588 if (meta->flags & VM_EXEC) !! 1764 if (vma->vm_flags & VM_EXEC)
1589 phdr.p_flags |= PF_X; 1765 phdr.p_flags |= PF_X;
1590 phdr.p_align = ELF_EXEC_PAGES 1766 phdr.p_align = ELF_EXEC_PAGESIZE;
1591 1767
1592 if (!dump_emit(cprm, &phdr, s 1768 if (!dump_emit(cprm, &phdr, sizeof(phdr)))
1593 goto end_coredump; 1769 goto end_coredump;
1594 } 1770 }
1595 1771
1596 if (!elf_core_write_extra_phdrs(cprm, 1772 if (!elf_core_write_extra_phdrs(cprm, offset))
1597 goto end_coredump; 1773 goto end_coredump;
1598 1774
1599 /* write out the notes section */ !! 1775 /* write out the notes section */
1600 if (!writenote(thread_list->notes, cp !! 1776 for (i = 0; i < numnote; i++)
1601 goto end_coredump; !! 1777 if (!writenote(notes + i, cprm))
1602 if (!writenote(&psinfo_note, cprm)) <<
1603 goto end_coredump; <<
1604 if (!writenote(&auxv_note, cprm)) <<
1605 goto end_coredump; <<
1606 for (i = 1; i < thread_list->num_note <<
1607 if (!writenote(thread_list->n <<
1608 goto end_coredump; 1778 goto end_coredump;
1609 1779
1610 /* write out the thread status notes 1780 /* write out the thread status notes section */
1611 for (tmp = thread_list->next; tmp; tm !! 1781 list_for_each(t, &thread_list) {
>> 1782 struct elf_thread_status *tmp =
>> 1783 list_entry(t, struct elf_thread_status, list);
>> 1784
1612 for (i = 0; i < tmp->num_note 1785 for (i = 0; i < tmp->num_notes; i++)
1613 if (!writenote(&tmp-> 1786 if (!writenote(&tmp->notes[i], cprm))
1614 goto end_core 1787 goto end_coredump;
1615 } 1788 }
1616 1789
1617 dump_skip_to(cprm, dataoff); !! 1790 if (!dump_skip(cprm, dataoff - cprm->written))
>> 1791 goto end_coredump;
1618 1792
1619 if (!elf_fdpic_dump_segments(cprm, cp !! 1793 if (!elf_fdpic_dump_segments(cprm))
1620 goto end_coredump; 1794 goto end_coredump;
1621 1795
1622 if (!elf_core_write_extra_data(cprm)) 1796 if (!elf_core_write_extra_data(cprm))
1623 goto end_coredump; 1797 goto end_coredump;
1624 1798
1625 if (e_phnum == PN_XNUM) { 1799 if (e_phnum == PN_XNUM) {
1626 if (!dump_emit(cprm, shdr4ext 1800 if (!dump_emit(cprm, shdr4extnum, sizeof(*shdr4extnum)))
1627 goto end_coredump; 1801 goto end_coredump;
1628 } 1802 }
1629 1803
1630 if (cprm->file->f_pos != offset) { 1804 if (cprm->file->f_pos != offset) {
1631 /* Sanity check */ 1805 /* Sanity check */
1632 printk(KERN_WARNING 1806 printk(KERN_WARNING
1633 "elf_core_dump: file-> 1807 "elf_core_dump: file->f_pos (%lld) != offset (%lld)\n",
1634 cprm->file->f_pos, off 1808 cprm->file->f_pos, offset);
1635 } 1809 }
1636 1810
1637 end_coredump: 1811 end_coredump:
1638 while (thread_list) { !! 1812 set_fs(fs);
1639 tmp = thread_list; !! 1813
1640 thread_list = thread_list->ne !! 1814 cleanup:
1641 kfree(tmp); !! 1815 while (!list_empty(&thread_list)) {
>> 1816 struct list_head *tmp = thread_list.next;
>> 1817 list_del(tmp);
>> 1818 kfree(list_entry(tmp, struct elf_thread_status, list));
1642 } 1819 }
1643 kfree(phdr4note); 1820 kfree(phdr4note);
1644 kfree(elf); 1821 kfree(elf);
>> 1822 kfree(prstatus);
1645 kfree(psinfo); 1823 kfree(psinfo);
>> 1824 kfree(notes);
>> 1825 kfree(fpu);
1646 kfree(shdr4extnum); 1826 kfree(shdr4extnum);
>> 1827 #ifdef ELF_CORE_COPY_XFPREGS
>> 1828 kfree(xfpu);
>> 1829 #endif
1647 return has_dumped; 1830 return has_dumped;
>> 1831 #undef NUM_NOTES
1648 } 1832 }
1649 1833
1650 #endif /* CONFIG_ELF_CORE */ 1834 #endif /* CONFIG_ELF_CORE */
1651 1835
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.