1 // SPDX-License-Identifier: GPL-2.0-only 1 // SPDX-License-Identifier: GPL-2.0-only
2 /* 2 /*
3 * fs/proc/vmcore.c Interface for accessi 3 * fs/proc/vmcore.c Interface for accessing the crash
4 * dump from the 4 * dump from the system's previous life.
5 * Heavily borrowed from fs/proc/kcore.c 5 * Heavily borrowed from fs/proc/kcore.c
6 * Created by: Hariprasad Nellitheertha ( 6 * Created by: Hariprasad Nellitheertha (hari@in.ibm.com)
7 * Copyright (C) IBM Corporation, 2004. A 7 * Copyright (C) IBM Corporation, 2004. All rights reserved
8 * 8 *
9 */ 9 */
10 10
11 #include <linux/mm.h> 11 #include <linux/mm.h>
12 #include <linux/kcore.h> 12 #include <linux/kcore.h>
13 #include <linux/user.h> 13 #include <linux/user.h>
14 #include <linux/elf.h> 14 #include <linux/elf.h>
15 #include <linux/elfcore.h> 15 #include <linux/elfcore.h>
16 #include <linux/export.h> 16 #include <linux/export.h>
17 #include <linux/slab.h> 17 #include <linux/slab.h>
18 #include <linux/highmem.h> 18 #include <linux/highmem.h>
19 #include <linux/printk.h> 19 #include <linux/printk.h>
20 #include <linux/memblock.h> 20 #include <linux/memblock.h>
21 #include <linux/init.h> 21 #include <linux/init.h>
22 #include <linux/crash_dump.h> 22 #include <linux/crash_dump.h>
23 #include <linux/list.h> 23 #include <linux/list.h>
24 #include <linux/moduleparam.h> 24 #include <linux/moduleparam.h>
25 #include <linux/mutex.h> 25 #include <linux/mutex.h>
26 #include <linux/vmalloc.h> 26 #include <linux/vmalloc.h>
27 #include <linux/pagemap.h> 27 #include <linux/pagemap.h>
28 #include <linux/uio.h> !! 28 #include <linux/uaccess.h>
29 #include <linux/cc_platform.h> !! 29 #include <linux/mem_encrypt.h>
>> 30 #include <asm/pgtable.h>
30 #include <asm/io.h> 31 #include <asm/io.h>
31 #include "internal.h" 32 #include "internal.h"
32 33
33 /* List representing chunks of contiguous memo 34 /* List representing chunks of contiguous memory areas and their offsets in
34 * vmcore file. 35 * vmcore file.
35 */ 36 */
36 static LIST_HEAD(vmcore_list); 37 static LIST_HEAD(vmcore_list);
37 38
38 /* Stores the pointer to the buffer containing 39 /* Stores the pointer to the buffer containing kernel elf core headers. */
39 static char *elfcorebuf; 40 static char *elfcorebuf;
40 static size_t elfcorebuf_sz; 41 static size_t elfcorebuf_sz;
41 static size_t elfcorebuf_sz_orig; 42 static size_t elfcorebuf_sz_orig;
42 43
43 static char *elfnotes_buf; 44 static char *elfnotes_buf;
44 static size_t elfnotes_sz; 45 static size_t elfnotes_sz;
45 /* Size of all notes minus the device dump not 46 /* Size of all notes minus the device dump notes */
46 static size_t elfnotes_orig_sz; 47 static size_t elfnotes_orig_sz;
47 48
48 /* Total size of vmcore file. */ 49 /* Total size of vmcore file. */
49 static u64 vmcore_size; 50 static u64 vmcore_size;
50 51
51 static struct proc_dir_entry *proc_vmcore; 52 static struct proc_dir_entry *proc_vmcore;
52 53
53 #ifdef CONFIG_PROC_VMCORE_DEVICE_DUMP 54 #ifdef CONFIG_PROC_VMCORE_DEVICE_DUMP
54 /* Device Dump list and mutex to synchronize a 55 /* Device Dump list and mutex to synchronize access to list */
55 static LIST_HEAD(vmcoredd_list); 56 static LIST_HEAD(vmcoredd_list);
56 static DEFINE_MUTEX(vmcoredd_mutex); 57 static DEFINE_MUTEX(vmcoredd_mutex);
57 58
58 static bool vmcoredd_disabled; 59 static bool vmcoredd_disabled;
59 core_param(novmcoredd, vmcoredd_disabled, bool 60 core_param(novmcoredd, vmcoredd_disabled, bool, 0);
60 #endif /* CONFIG_PROC_VMCORE_DEVICE_DUMP */ 61 #endif /* CONFIG_PROC_VMCORE_DEVICE_DUMP */
61 62
62 /* Device Dump Size */ 63 /* Device Dump Size */
63 static size_t vmcoredd_orig_sz; 64 static size_t vmcoredd_orig_sz;
64 65
65 static DEFINE_SPINLOCK(vmcore_cb_lock); !! 66 /*
66 DEFINE_STATIC_SRCU(vmcore_cb_srcu); !! 67 * Returns > 0 for RAM pages, 0 for non-RAM pages, < 0 on error
67 /* List of registered vmcore callbacks. */ !! 68 * The called function has to take care of module refcounting.
68 static LIST_HEAD(vmcore_cb_list); !! 69 */
69 /* Whether the vmcore has been opened once. */ !! 70 static int (*oldmem_pfn_is_ram)(unsigned long pfn);
70 static bool vmcore_opened; <<
71 <<
72 void register_vmcore_cb(struct vmcore_cb *cb) <<
73 { <<
74 INIT_LIST_HEAD(&cb->next); <<
75 spin_lock(&vmcore_cb_lock); <<
76 list_add_tail(&cb->next, &vmcore_cb_li <<
77 /* <<
78 * Registering a vmcore callback after <<
79 * very unusual (e.g., manual driver l <<
80 */ <<
81 if (vmcore_opened) <<
82 pr_warn_once("Unexpected vmcor <<
83 spin_unlock(&vmcore_cb_lock); <<
84 } <<
85 EXPORT_SYMBOL_GPL(register_vmcore_cb); <<
86 71
87 void unregister_vmcore_cb(struct vmcore_cb *cb !! 72 int register_oldmem_pfn_is_ram(int (*fn)(unsigned long pfn))
88 { 73 {
89 spin_lock(&vmcore_cb_lock); !! 74 if (oldmem_pfn_is_ram)
90 list_del_rcu(&cb->next); !! 75 return -EBUSY;
91 /* !! 76 oldmem_pfn_is_ram = fn;
92 * Unregistering a vmcore callback aft !! 77 return 0;
93 * very unusual (e.g., forced driver r <<
94 * unregistering. <<
95 */ <<
96 if (vmcore_opened) <<
97 pr_warn_once("Unexpected vmcor <<
98 spin_unlock(&vmcore_cb_lock); <<
99 <<
100 synchronize_srcu(&vmcore_cb_srcu); <<
101 } 78 }
102 EXPORT_SYMBOL_GPL(unregister_vmcore_cb); !! 79 EXPORT_SYMBOL_GPL(register_oldmem_pfn_is_ram);
103 80
104 static bool pfn_is_ram(unsigned long pfn) !! 81 void unregister_oldmem_pfn_is_ram(void)
105 { 82 {
106 struct vmcore_cb *cb; !! 83 oldmem_pfn_is_ram = NULL;
107 bool ret = true; !! 84 wmb();
108 <<
109 list_for_each_entry_srcu(cb, &vmcore_c <<
110 srcu_read_loc <<
111 if (unlikely(!cb->pfn_is_ram)) <<
112 continue; <<
113 ret = cb->pfn_is_ram(cb, pfn); <<
114 if (!ret) <<
115 break; <<
116 } <<
117 <<
118 return ret; <<
119 } 85 }
>> 86 EXPORT_SYMBOL_GPL(unregister_oldmem_pfn_is_ram);
120 87
121 static int open_vmcore(struct inode *inode, st !! 88 static int pfn_is_ram(unsigned long pfn)
122 { 89 {
123 spin_lock(&vmcore_cb_lock); !! 90 int (*fn)(unsigned long pfn);
124 vmcore_opened = true; !! 91 /* pfn is ram unless fn() checks pagetype */
125 spin_unlock(&vmcore_cb_lock); !! 92 int ret = 1;
126 93
127 return 0; !! 94 /*
>> 95 * Ask hypervisor if the pfn is really ram.
>> 96 * A ballooned page contains no data and reading from such a page
>> 97 * will cause high load in the hypervisor.
>> 98 */
>> 99 fn = oldmem_pfn_is_ram;
>> 100 if (fn)
>> 101 ret = fn(pfn);
>> 102
>> 103 return ret;
128 } 104 }
129 105
130 /* Reads a page from the oldmem device from gi 106 /* Reads a page from the oldmem device from given offset. */
131 ssize_t read_from_oldmem(struct iov_iter *iter !! 107 ssize_t read_from_oldmem(char *buf, size_t count,
132 u64 *ppos, bool encry !! 108 u64 *ppos, int userbuf,
>> 109 bool encrypted)
133 { 110 {
134 unsigned long pfn, offset; 111 unsigned long pfn, offset;
135 ssize_t nr_bytes; !! 112 size_t nr_bytes;
136 ssize_t read = 0, tmp; 113 ssize_t read = 0, tmp;
137 int idx; <<
138 114
139 if (!count) 115 if (!count)
140 return 0; 116 return 0;
141 117
142 offset = (unsigned long)(*ppos % PAGE_ 118 offset = (unsigned long)(*ppos % PAGE_SIZE);
143 pfn = (unsigned long)(*ppos / PAGE_SIZ 119 pfn = (unsigned long)(*ppos / PAGE_SIZE);
144 120
145 idx = srcu_read_lock(&vmcore_cb_srcu); <<
146 do { 121 do {
147 if (count > (PAGE_SIZE - offse 122 if (count > (PAGE_SIZE - offset))
148 nr_bytes = PAGE_SIZE - 123 nr_bytes = PAGE_SIZE - offset;
149 else 124 else
150 nr_bytes = count; 125 nr_bytes = count;
151 126
152 /* If pfn is not ram, return z 127 /* If pfn is not ram, return zeros for sparse dump files */
153 if (!pfn_is_ram(pfn)) { !! 128 if (pfn_is_ram(pfn) == 0)
154 tmp = iov_iter_zero(nr !! 129 memset(buf, 0, nr_bytes);
155 } else { !! 130 else {
156 if (encrypted) 131 if (encrypted)
157 tmp = copy_old !! 132 tmp = copy_oldmem_page_encrypted(pfn, buf,
158 133 nr_bytes,
159 !! 134 offset,
>> 135 userbuf);
160 else 136 else
161 tmp = copy_old !! 137 tmp = copy_oldmem_page(pfn, buf, nr_bytes,
162 !! 138 offset, userbuf);
163 } <<
164 if (tmp < nr_bytes) { <<
165 srcu_read_unlock(&vmco <<
166 return -EFAULT; <<
167 } <<
168 139
>> 140 if (tmp < 0)
>> 141 return tmp;
>> 142 }
169 *ppos += nr_bytes; 143 *ppos += nr_bytes;
170 count -= nr_bytes; 144 count -= nr_bytes;
>> 145 buf += nr_bytes;
171 read += nr_bytes; 146 read += nr_bytes;
172 ++pfn; 147 ++pfn;
173 offset = 0; 148 offset = 0;
174 } while (count); 149 } while (count);
175 srcu_read_unlock(&vmcore_cb_srcu, idx) <<
176 150
177 return read; 151 return read;
178 } 152 }
179 153
180 /* 154 /*
181 * Architectures may override this function to 155 * Architectures may override this function to allocate ELF header in 2nd kernel
182 */ 156 */
183 int __weak elfcorehdr_alloc(unsigned long long 157 int __weak elfcorehdr_alloc(unsigned long long *addr, unsigned long long *size)
184 { 158 {
185 return 0; 159 return 0;
186 } 160 }
187 161
188 /* 162 /*
189 * Architectures may override this function to 163 * Architectures may override this function to free header
190 */ 164 */
191 void __weak elfcorehdr_free(unsigned long long 165 void __weak elfcorehdr_free(unsigned long long addr)
192 {} 166 {}
193 167
194 /* 168 /*
195 * Architectures may override this function to 169 * Architectures may override this function to read from ELF header
196 */ 170 */
197 ssize_t __weak elfcorehdr_read(char *buf, size 171 ssize_t __weak elfcorehdr_read(char *buf, size_t count, u64 *ppos)
198 { 172 {
199 struct kvec kvec = { .iov_base = buf, !! 173 return read_from_oldmem(buf, count, ppos, 0, false);
200 struct iov_iter iter; <<
201 <<
202 iov_iter_kvec(&iter, ITER_DEST, &kvec, <<
203 <<
204 return read_from_oldmem(&iter, count, <<
205 } 174 }
206 175
207 /* 176 /*
208 * Architectures may override this function to 177 * Architectures may override this function to read from notes sections
209 */ 178 */
210 ssize_t __weak elfcorehdr_read_notes(char *buf 179 ssize_t __weak elfcorehdr_read_notes(char *buf, size_t count, u64 *ppos)
211 { 180 {
212 struct kvec kvec = { .iov_base = buf, !! 181 return read_from_oldmem(buf, count, ppos, 0, mem_encrypt_active());
213 struct iov_iter iter; <<
214 <<
215 iov_iter_kvec(&iter, ITER_DEST, &kvec, <<
216 <<
217 return read_from_oldmem(&iter, count, <<
218 cc_platform_has(CC_ATT <<
219 } 182 }
220 183
221 /* 184 /*
222 * Architectures may override this function to 185 * Architectures may override this function to map oldmem
223 */ 186 */
224 int __weak remap_oldmem_pfn_range(struct vm_ar 187 int __weak remap_oldmem_pfn_range(struct vm_area_struct *vma,
225 unsigned lon 188 unsigned long from, unsigned long pfn,
226 unsigned lon 189 unsigned long size, pgprot_t prot)
227 { 190 {
228 prot = pgprot_encrypted(prot); 191 prot = pgprot_encrypted(prot);
229 return remap_pfn_range(vma, from, pfn, 192 return remap_pfn_range(vma, from, pfn, size, prot);
230 } 193 }
231 194
232 /* 195 /*
233 * Architectures which support memory encrypti 196 * Architectures which support memory encryption override this.
234 */ 197 */
235 ssize_t __weak copy_oldmem_page_encrypted(stru !! 198 ssize_t __weak
236 unsigned long pfn, size_t csiz !! 199 copy_oldmem_page_encrypted(unsigned long pfn, char *buf, size_t csize,
>> 200 unsigned long offset, int userbuf)
237 { 201 {
238 return copy_oldmem_page(iter, pfn, csi !! 202 return copy_oldmem_page(pfn, buf, csize, offset, userbuf);
>> 203 }
>> 204
>> 205 /*
>> 206 * Copy to either kernel or user space
>> 207 */
>> 208 static int copy_to(void *target, void *src, size_t size, int userbuf)
>> 209 {
>> 210 if (userbuf) {
>> 211 if (copy_to_user((char __user *) target, src, size))
>> 212 return -EFAULT;
>> 213 } else {
>> 214 memcpy(target, src, size);
>> 215 }
>> 216 return 0;
239 } 217 }
240 218
241 #ifdef CONFIG_PROC_VMCORE_DEVICE_DUMP 219 #ifdef CONFIG_PROC_VMCORE_DEVICE_DUMP
242 static int vmcoredd_copy_dumps(struct iov_iter !! 220 static int vmcoredd_copy_dumps(void *dst, u64 start, size_t size, int userbuf)
243 { 221 {
244 struct vmcoredd_node *dump; 222 struct vmcoredd_node *dump;
245 u64 offset = 0; 223 u64 offset = 0;
246 int ret = 0; 224 int ret = 0;
247 size_t tsz; 225 size_t tsz;
248 char *buf; 226 char *buf;
249 227
250 mutex_lock(&vmcoredd_mutex); 228 mutex_lock(&vmcoredd_mutex);
251 list_for_each_entry(dump, &vmcoredd_li 229 list_for_each_entry(dump, &vmcoredd_list, list) {
252 if (start < offset + dump->siz 230 if (start < offset + dump->size) {
253 tsz = min(offset + (u6 231 tsz = min(offset + (u64)dump->size - start, (u64)size);
254 buf = dump->buf + star 232 buf = dump->buf + start - offset;
255 if (copy_to_iter(buf, !! 233 if (copy_to(dst, buf, tsz, userbuf)) {
256 ret = -EFAULT; 234 ret = -EFAULT;
257 goto out_unloc 235 goto out_unlock;
258 } 236 }
259 237
260 size -= tsz; 238 size -= tsz;
261 start += tsz; 239 start += tsz;
>> 240 dst += tsz;
262 241
263 /* Leave now if buffer 242 /* Leave now if buffer filled already */
264 if (!size) 243 if (!size)
265 goto out_unloc 244 goto out_unlock;
266 } 245 }
267 offset += dump->size; 246 offset += dump->size;
268 } 247 }
269 248
270 out_unlock: 249 out_unlock:
271 mutex_unlock(&vmcoredd_mutex); 250 mutex_unlock(&vmcoredd_mutex);
272 return ret; 251 return ret;
273 } 252 }
274 253
275 #ifdef CONFIG_MMU 254 #ifdef CONFIG_MMU
276 static int vmcoredd_mmap_dumps(struct vm_area_ 255 static int vmcoredd_mmap_dumps(struct vm_area_struct *vma, unsigned long dst,
277 u64 start, size 256 u64 start, size_t size)
278 { 257 {
279 struct vmcoredd_node *dump; 258 struct vmcoredd_node *dump;
280 u64 offset = 0; 259 u64 offset = 0;
281 int ret = 0; 260 int ret = 0;
282 size_t tsz; 261 size_t tsz;
283 char *buf; 262 char *buf;
284 263
285 mutex_lock(&vmcoredd_mutex); 264 mutex_lock(&vmcoredd_mutex);
286 list_for_each_entry(dump, &vmcoredd_li 265 list_for_each_entry(dump, &vmcoredd_list, list) {
287 if (start < offset + dump->siz 266 if (start < offset + dump->size) {
288 tsz = min(offset + (u6 267 tsz = min(offset + (u64)dump->size - start, (u64)size);
289 buf = dump->buf + star 268 buf = dump->buf + start - offset;
290 if (remap_vmalloc_rang 269 if (remap_vmalloc_range_partial(vma, dst, buf, 0,
291 270 tsz)) {
292 ret = -EFAULT; 271 ret = -EFAULT;
293 goto out_unloc 272 goto out_unlock;
294 } 273 }
295 274
296 size -= tsz; 275 size -= tsz;
297 start += tsz; 276 start += tsz;
298 dst += tsz; 277 dst += tsz;
299 278
300 /* Leave now if buffer 279 /* Leave now if buffer filled already */
301 if (!size) 280 if (!size)
302 goto out_unloc 281 goto out_unlock;
303 } 282 }
304 offset += dump->size; 283 offset += dump->size;
305 } 284 }
306 285
307 out_unlock: 286 out_unlock:
308 mutex_unlock(&vmcoredd_mutex); 287 mutex_unlock(&vmcoredd_mutex);
309 return ret; 288 return ret;
310 } 289 }
311 #endif /* CONFIG_MMU */ 290 #endif /* CONFIG_MMU */
312 #endif /* CONFIG_PROC_VMCORE_DEVICE_DUMP */ 291 #endif /* CONFIG_PROC_VMCORE_DEVICE_DUMP */
313 292
314 /* Read from the ELF header and then the crash 293 /* Read from the ELF header and then the crash dump. On error, negative value is
315 * returned otherwise number of bytes read are 294 * returned otherwise number of bytes read are returned.
316 */ 295 */
317 static ssize_t __read_vmcore(struct iov_iter * !! 296 static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
>> 297 int userbuf)
318 { 298 {
319 ssize_t acc = 0, tmp; 299 ssize_t acc = 0, tmp;
320 size_t tsz; 300 size_t tsz;
321 u64 start; 301 u64 start;
322 struct vmcore *m = NULL; 302 struct vmcore *m = NULL;
323 303
324 if (!iov_iter_count(iter) || *fpos >= !! 304 if (buflen == 0 || *fpos >= vmcore_size)
325 return 0; 305 return 0;
326 306
327 iov_iter_truncate(iter, vmcore_size - !! 307 /* trim buflen to not go beyond EOF */
>> 308 if (buflen > vmcore_size - *fpos)
>> 309 buflen = vmcore_size - *fpos;
328 310
329 /* Read ELF core header */ 311 /* Read ELF core header */
330 if (*fpos < elfcorebuf_sz) { 312 if (*fpos < elfcorebuf_sz) {
331 tsz = min(elfcorebuf_sz - (siz !! 313 tsz = min(elfcorebuf_sz - (size_t)*fpos, buflen);
332 if (copy_to_iter(elfcorebuf + !! 314 if (copy_to(buffer, elfcorebuf + *fpos, tsz, userbuf))
333 return -EFAULT; 315 return -EFAULT;
>> 316 buflen -= tsz;
334 *fpos += tsz; 317 *fpos += tsz;
>> 318 buffer += tsz;
335 acc += tsz; 319 acc += tsz;
336 320
337 /* leave now if filled buffer 321 /* leave now if filled buffer already */
338 if (!iov_iter_count(iter)) !! 322 if (buflen == 0)
339 return acc; 323 return acc;
340 } 324 }
341 325
342 /* Read ELF note segment */ !! 326 /* Read Elf note segment */
343 if (*fpos < elfcorebuf_sz + elfnotes_s 327 if (*fpos < elfcorebuf_sz + elfnotes_sz) {
344 void *kaddr; 328 void *kaddr;
345 329
346 /* We add device dumps before 330 /* We add device dumps before other elf notes because the
347 * other elf notes may not fil 331 * other elf notes may not fill the elf notes buffer
348 * completely and we will end 332 * completely and we will end up with zero-filled data
349 * between the elf notes and t 333 * between the elf notes and the device dumps. Tools will
350 * then try to decode this zer 334 * then try to decode this zero-filled data as valid notes
351 * and we don't want that. Hen 335 * and we don't want that. Hence, adding device dumps before
352 * the other elf notes ensure 336 * the other elf notes ensure that zero-filled data can be
353 * avoided. 337 * avoided.
354 */ 338 */
355 #ifdef CONFIG_PROC_VMCORE_DEVICE_DUMP 339 #ifdef CONFIG_PROC_VMCORE_DEVICE_DUMP
356 /* Read device dumps */ 340 /* Read device dumps */
357 if (*fpos < elfcorebuf_sz + vm 341 if (*fpos < elfcorebuf_sz + vmcoredd_orig_sz) {
358 tsz = min(elfcorebuf_s 342 tsz = min(elfcorebuf_sz + vmcoredd_orig_sz -
359 (size_t)*fpo !! 343 (size_t)*fpos, buflen);
360 start = *fpos - elfcor 344 start = *fpos - elfcorebuf_sz;
361 if (vmcoredd_copy_dump !! 345 if (vmcoredd_copy_dumps(buffer, start, tsz, userbuf))
362 return -EFAULT 346 return -EFAULT;
363 347
>> 348 buflen -= tsz;
364 *fpos += tsz; 349 *fpos += tsz;
>> 350 buffer += tsz;
365 acc += tsz; 351 acc += tsz;
366 352
367 /* leave now if filled 353 /* leave now if filled buffer already */
368 if (!iov_iter_count(it !! 354 if (!buflen)
369 return acc; 355 return acc;
370 } 356 }
371 #endif /* CONFIG_PROC_VMCORE_DEVICE_DUMP */ 357 #endif /* CONFIG_PROC_VMCORE_DEVICE_DUMP */
372 358
373 /* Read remaining elf notes */ 359 /* Read remaining elf notes */
374 tsz = min(elfcorebuf_sz + elfn !! 360 tsz = min(elfcorebuf_sz + elfnotes_sz - (size_t)*fpos, buflen);
375 iov_iter_count(iter) <<
376 kaddr = elfnotes_buf + *fpos - 361 kaddr = elfnotes_buf + *fpos - elfcorebuf_sz - vmcoredd_orig_sz;
377 if (copy_to_iter(kaddr, tsz, i !! 362 if (copy_to(buffer, kaddr, tsz, userbuf))
378 return -EFAULT; 363 return -EFAULT;
379 364
>> 365 buflen -= tsz;
380 *fpos += tsz; 366 *fpos += tsz;
>> 367 buffer += tsz;
381 acc += tsz; 368 acc += tsz;
382 369
383 /* leave now if filled buffer 370 /* leave now if filled buffer already */
384 if (!iov_iter_count(iter)) !! 371 if (buflen == 0)
385 return acc; 372 return acc;
386 <<
387 cond_resched(); <<
388 } 373 }
389 374
390 list_for_each_entry(m, &vmcore_list, l 375 list_for_each_entry(m, &vmcore_list, list) {
391 if (*fpos < m->offset + m->siz 376 if (*fpos < m->offset + m->size) {
392 tsz = (size_t)min_t(un 377 tsz = (size_t)min_t(unsigned long long,
393 m- 378 m->offset + m->size - *fpos,
394 io !! 379 buflen);
395 start = m->paddr + *fp 380 start = m->paddr + *fpos - m->offset;
396 tmp = read_from_oldmem !! 381 tmp = read_from_oldmem(buffer, tsz, &start,
397 cc_pla !! 382 userbuf, mem_encrypt_active());
398 if (tmp < 0) 383 if (tmp < 0)
399 return tmp; 384 return tmp;
>> 385 buflen -= tsz;
400 *fpos += tsz; 386 *fpos += tsz;
>> 387 buffer += tsz;
401 acc += tsz; 388 acc += tsz;
402 389
403 /* leave now if filled 390 /* leave now if filled buffer already */
404 if (!iov_iter_count(it !! 391 if (buflen == 0)
405 return acc; 392 return acc;
406 } 393 }
407 } 394 }
408 395
409 return acc; 396 return acc;
410 } 397 }
411 398
412 static ssize_t read_vmcore(struct kiocb *iocb, !! 399 static ssize_t read_vmcore(struct file *file, char __user *buffer,
>> 400 size_t buflen, loff_t *fpos)
413 { 401 {
414 return __read_vmcore(iter, &iocb->ki_p !! 402 return __read_vmcore((__force char *) buffer, buflen, fpos, 1);
415 } 403 }
416 404
417 /* 405 /*
418 * The vmcore fault handler uses the page cach 406 * The vmcore fault handler uses the page cache and fills data using the
419 * standard __read_vmcore() function. !! 407 * standard __vmcore_read() function.
420 * 408 *
421 * On s390 the fault handler is used for memor 409 * On s390 the fault handler is used for memory regions that can't be mapped
422 * directly with remap_pfn_range(). 410 * directly with remap_pfn_range().
423 */ 411 */
424 static vm_fault_t mmap_vmcore_fault(struct vm_ 412 static vm_fault_t mmap_vmcore_fault(struct vm_fault *vmf)
425 { 413 {
426 #ifdef CONFIG_S390 414 #ifdef CONFIG_S390
427 struct address_space *mapping = vmf->v 415 struct address_space *mapping = vmf->vma->vm_file->f_mapping;
428 pgoff_t index = vmf->pgoff; 416 pgoff_t index = vmf->pgoff;
429 struct iov_iter iter; <<
430 struct kvec kvec; <<
431 struct page *page; 417 struct page *page;
432 loff_t offset; 418 loff_t offset;
>> 419 char *buf;
433 int rc; 420 int rc;
434 421
435 page = find_or_create_page(mapping, in 422 page = find_or_create_page(mapping, index, GFP_KERNEL);
436 if (!page) 423 if (!page)
437 return VM_FAULT_OOM; 424 return VM_FAULT_OOM;
438 if (!PageUptodate(page)) { 425 if (!PageUptodate(page)) {
439 offset = (loff_t) index << PAG 426 offset = (loff_t) index << PAGE_SHIFT;
440 kvec.iov_base = page_address(p !! 427 buf = __va((page_to_pfn(page) << PAGE_SHIFT));
441 kvec.iov_len = PAGE_SIZE; !! 428 rc = __read_vmcore(buf, PAGE_SIZE, &offset, 0);
442 iov_iter_kvec(&iter, ITER_DEST <<
443 <<
444 rc = __read_vmcore(&iter, &off <<
445 if (rc < 0) { 429 if (rc < 0) {
446 unlock_page(page); 430 unlock_page(page);
447 put_page(page); 431 put_page(page);
448 return vmf_error(rc); 432 return vmf_error(rc);
449 } 433 }
450 SetPageUptodate(page); 434 SetPageUptodate(page);
451 } 435 }
452 unlock_page(page); 436 unlock_page(page);
453 vmf->page = page; 437 vmf->page = page;
454 return 0; 438 return 0;
455 #else 439 #else
456 return VM_FAULT_SIGBUS; 440 return VM_FAULT_SIGBUS;
457 #endif 441 #endif
458 } 442 }
459 443
>> 444 static const struct vm_operations_struct vmcore_mmap_ops = {
>> 445 .fault = mmap_vmcore_fault,
>> 446 };
>> 447
460 /** 448 /**
461 * vmcore_alloc_buf - allocate buffer in vmall 449 * vmcore_alloc_buf - allocate buffer in vmalloc memory
462 * @size: size of buffer !! 450 * @sizez: size of buffer
463 * 451 *
464 * If CONFIG_MMU is defined, use vmalloc_user( 452 * If CONFIG_MMU is defined, use vmalloc_user() to allow users to mmap
465 * the buffer to user-space by means of remap_ 453 * the buffer to user-space by means of remap_vmalloc_range().
466 * 454 *
467 * If CONFIG_MMU is not defined, use vzalloc() 455 * If CONFIG_MMU is not defined, use vzalloc() since mmap_vmcore() is
468 * disabled and there's no need to allow users 456 * disabled and there's no need to allow users to mmap the buffer.
469 */ 457 */
470 static inline char *vmcore_alloc_buf(size_t si 458 static inline char *vmcore_alloc_buf(size_t size)
471 { 459 {
472 #ifdef CONFIG_MMU 460 #ifdef CONFIG_MMU
473 return vmalloc_user(size); 461 return vmalloc_user(size);
474 #else 462 #else
475 return vzalloc(size); 463 return vzalloc(size);
476 #endif 464 #endif
477 } 465 }
478 466
479 /* 467 /*
480 * Disable mmap_vmcore() if CONFIG_MMU is not 468 * Disable mmap_vmcore() if CONFIG_MMU is not defined. MMU is
481 * essential for mmap_vmcore() in order to map 469 * essential for mmap_vmcore() in order to map physically
482 * non-contiguous objects (ELF header, ELF not 470 * non-contiguous objects (ELF header, ELF note segment and memory
483 * regions in the 1st kernel pointed to by PT_ 471 * regions in the 1st kernel pointed to by PT_LOAD entries) into
484 * virtually contiguous user-space in ELF layo 472 * virtually contiguous user-space in ELF layout.
485 */ 473 */
486 #ifdef CONFIG_MMU 474 #ifdef CONFIG_MMU
487 <<
488 static const struct vm_operations_struct vmcor <<
489 .fault = mmap_vmcore_fault, <<
490 }; <<
491 <<
492 /* 475 /*
493 * remap_oldmem_pfn_checked - do remap_oldmem_ 476 * remap_oldmem_pfn_checked - do remap_oldmem_pfn_range replacing all pages
494 * reported as not being ram with the zero pag 477 * reported as not being ram with the zero page.
495 * 478 *
496 * @vma: vm_area_struct describing requested m 479 * @vma: vm_area_struct describing requested mapping
497 * @from: start remapping from 480 * @from: start remapping from
498 * @pfn: page frame number to start remapping 481 * @pfn: page frame number to start remapping to
499 * @size: remapping size 482 * @size: remapping size
500 * @prot: protection bits 483 * @prot: protection bits
501 * 484 *
502 * Returns zero on success, -EAGAIN on failure 485 * Returns zero on success, -EAGAIN on failure.
503 */ 486 */
504 static int remap_oldmem_pfn_checked(struct vm_ 487 static int remap_oldmem_pfn_checked(struct vm_area_struct *vma,
505 unsigned l 488 unsigned long from, unsigned long pfn,
506 unsigned l 489 unsigned long size, pgprot_t prot)
507 { 490 {
508 unsigned long map_size; 491 unsigned long map_size;
509 unsigned long pos_start, pos_end, pos; 492 unsigned long pos_start, pos_end, pos;
510 unsigned long zeropage_pfn = my_zero_p 493 unsigned long zeropage_pfn = my_zero_pfn(0);
511 size_t len = 0; 494 size_t len = 0;
512 495
513 pos_start = pfn; 496 pos_start = pfn;
514 pos_end = pfn + (size >> PAGE_SHIFT); 497 pos_end = pfn + (size >> PAGE_SHIFT);
515 498
516 for (pos = pos_start; pos < pos_end; + 499 for (pos = pos_start; pos < pos_end; ++pos) {
517 if (!pfn_is_ram(pos)) { 500 if (!pfn_is_ram(pos)) {
518 /* 501 /*
519 * We hit a page which 502 * We hit a page which is not ram. Remap the continuous
520 * region between pos_ 503 * region between pos_start and pos-1 and replace
521 * the non-ram page at 504 * the non-ram page at pos with the zero page.
522 */ 505 */
523 if (pos > pos_start) { 506 if (pos > pos_start) {
524 /* Remap conti 507 /* Remap continuous region */
525 map_size = (po 508 map_size = (pos - pos_start) << PAGE_SHIFT;
526 if (remap_oldm 509 if (remap_oldmem_pfn_range(vma, from + len,
527 510 pos_start, map_size,
528 511 prot))
529 goto f 512 goto fail;
530 len += map_siz 513 len += map_size;
531 } 514 }
532 /* Remap the zero page 515 /* Remap the zero page */
533 if (remap_oldmem_pfn_r 516 if (remap_oldmem_pfn_range(vma, from + len,
534 517 zeropage_pfn,
535 518 PAGE_SIZE, prot))
536 goto fail; 519 goto fail;
537 len += PAGE_SIZE; 520 len += PAGE_SIZE;
538 pos_start = pos + 1; 521 pos_start = pos + 1;
539 } 522 }
540 } 523 }
541 if (pos > pos_start) { 524 if (pos > pos_start) {
542 /* Remap the rest */ 525 /* Remap the rest */
543 map_size = (pos - pos_start) < 526 map_size = (pos - pos_start) << PAGE_SHIFT;
544 if (remap_oldmem_pfn_range(vma 527 if (remap_oldmem_pfn_range(vma, from + len, pos_start,
545 map 528 map_size, prot))
546 goto fail; 529 goto fail;
547 } 530 }
548 return 0; 531 return 0;
549 fail: 532 fail:
550 do_munmap(vma->vm_mm, from, len, NULL) 533 do_munmap(vma->vm_mm, from, len, NULL);
551 return -EAGAIN; 534 return -EAGAIN;
552 } 535 }
553 536
554 static int vmcore_remap_oldmem_pfn(struct vm_a 537 static int vmcore_remap_oldmem_pfn(struct vm_area_struct *vma,
555 unsigned long from 538 unsigned long from, unsigned long pfn,
556 unsigned long size 539 unsigned long size, pgprot_t prot)
557 { 540 {
558 int ret, idx; <<
559 <<
560 /* 541 /*
561 * Check if a callback was registered !! 542 * Check if oldmem_pfn_is_ram was registered to avoid
562 * pages without a reason. !! 543 * looping over all pages without a reason.
563 */ 544 */
564 idx = srcu_read_lock(&vmcore_cb_srcu); !! 545 if (oldmem_pfn_is_ram)
565 if (!list_empty(&vmcore_cb_list)) !! 546 return remap_oldmem_pfn_checked(vma, from, pfn, size, prot);
566 ret = remap_oldmem_pfn_checked <<
567 else 547 else
568 ret = remap_oldmem_pfn_range(v !! 548 return remap_oldmem_pfn_range(vma, from, pfn, size, prot);
569 srcu_read_unlock(&vmcore_cb_srcu, idx) <<
570 return ret; <<
571 } 549 }
572 550
573 static int mmap_vmcore(struct file *file, stru 551 static int mmap_vmcore(struct file *file, struct vm_area_struct *vma)
574 { 552 {
575 size_t size = vma->vm_end - vma->vm_st 553 size_t size = vma->vm_end - vma->vm_start;
576 u64 start, end, len, tsz; 554 u64 start, end, len, tsz;
577 struct vmcore *m; 555 struct vmcore *m;
578 556
579 start = (u64)vma->vm_pgoff << PAGE_SHI 557 start = (u64)vma->vm_pgoff << PAGE_SHIFT;
580 end = start + size; 558 end = start + size;
581 559
582 if (size > vmcore_size || end > vmcore 560 if (size > vmcore_size || end > vmcore_size)
583 return -EINVAL; 561 return -EINVAL;
584 562
585 if (vma->vm_flags & (VM_WRITE | VM_EXE 563 if (vma->vm_flags & (VM_WRITE | VM_EXEC))
586 return -EPERM; 564 return -EPERM;
587 565
588 vm_flags_mod(vma, VM_MIXEDMAP, VM_MAYW !! 566 vma->vm_flags &= ~(VM_MAYWRITE | VM_MAYEXEC);
>> 567 vma->vm_flags |= VM_MIXEDMAP;
589 vma->vm_ops = &vmcore_mmap_ops; 568 vma->vm_ops = &vmcore_mmap_ops;
590 569
591 len = 0; 570 len = 0;
592 571
593 if (start < elfcorebuf_sz) { 572 if (start < elfcorebuf_sz) {
594 u64 pfn; 573 u64 pfn;
595 574
596 tsz = min(elfcorebuf_sz - (siz 575 tsz = min(elfcorebuf_sz - (size_t)start, size);
597 pfn = __pa(elfcorebuf + start) 576 pfn = __pa(elfcorebuf + start) >> PAGE_SHIFT;
598 if (remap_pfn_range(vma, vma-> 577 if (remap_pfn_range(vma, vma->vm_start, pfn, tsz,
599 vma->vm_pa 578 vma->vm_page_prot))
600 return -EAGAIN; 579 return -EAGAIN;
601 size -= tsz; 580 size -= tsz;
602 start += tsz; 581 start += tsz;
603 len += tsz; 582 len += tsz;
604 583
605 if (size == 0) 584 if (size == 0)
606 return 0; 585 return 0;
607 } 586 }
608 587
609 if (start < elfcorebuf_sz + elfnotes_s 588 if (start < elfcorebuf_sz + elfnotes_sz) {
610 void *kaddr; 589 void *kaddr;
611 590
612 /* We add device dumps before 591 /* We add device dumps before other elf notes because the
613 * other elf notes may not fil 592 * other elf notes may not fill the elf notes buffer
614 * completely and we will end 593 * completely and we will end up with zero-filled data
615 * between the elf notes and t 594 * between the elf notes and the device dumps. Tools will
616 * then try to decode this zer 595 * then try to decode this zero-filled data as valid notes
617 * and we don't want that. Hen 596 * and we don't want that. Hence, adding device dumps before
618 * the other elf notes ensure 597 * the other elf notes ensure that zero-filled data can be
619 * avoided. This also ensures 598 * avoided. This also ensures that the device dumps and
620 * other elf notes can be prop 599 * other elf notes can be properly mmaped at page aligned
621 * address. 600 * address.
622 */ 601 */
623 #ifdef CONFIG_PROC_VMCORE_DEVICE_DUMP 602 #ifdef CONFIG_PROC_VMCORE_DEVICE_DUMP
624 /* Read device dumps */ 603 /* Read device dumps */
625 if (start < elfcorebuf_sz + vm 604 if (start < elfcorebuf_sz + vmcoredd_orig_sz) {
626 u64 start_off; 605 u64 start_off;
627 606
628 tsz = min(elfcorebuf_s 607 tsz = min(elfcorebuf_sz + vmcoredd_orig_sz -
629 (size_t)star 608 (size_t)start, size);
630 start_off = start - el 609 start_off = start - elfcorebuf_sz;
631 if (vmcoredd_mmap_dump 610 if (vmcoredd_mmap_dumps(vma, vma->vm_start + len,
632 611 start_off, tsz))
633 goto fail; 612 goto fail;
634 613
635 size -= tsz; 614 size -= tsz;
636 start += tsz; 615 start += tsz;
637 len += tsz; 616 len += tsz;
638 617
639 /* leave now if filled 618 /* leave now if filled buffer already */
640 if (!size) 619 if (!size)
641 return 0; 620 return 0;
642 } 621 }
643 #endif /* CONFIG_PROC_VMCORE_DEVICE_DUMP */ 622 #endif /* CONFIG_PROC_VMCORE_DEVICE_DUMP */
644 623
645 /* Read remaining elf notes */ 624 /* Read remaining elf notes */
646 tsz = min(elfcorebuf_sz + elfn 625 tsz = min(elfcorebuf_sz + elfnotes_sz - (size_t)start, size);
647 kaddr = elfnotes_buf + start - 626 kaddr = elfnotes_buf + start - elfcorebuf_sz - vmcoredd_orig_sz;
648 if (remap_vmalloc_range_partia 627 if (remap_vmalloc_range_partial(vma, vma->vm_start + len,
649 628 kaddr, 0, tsz))
650 goto fail; 629 goto fail;
651 630
652 size -= tsz; 631 size -= tsz;
653 start += tsz; 632 start += tsz;
654 len += tsz; 633 len += tsz;
655 634
656 if (size == 0) 635 if (size == 0)
657 return 0; 636 return 0;
658 } 637 }
659 638
660 list_for_each_entry(m, &vmcore_list, l 639 list_for_each_entry(m, &vmcore_list, list) {
661 if (start < m->offset + m->siz 640 if (start < m->offset + m->size) {
662 u64 paddr = 0; 641 u64 paddr = 0;
663 642
664 tsz = (size_t)min_t(un 643 tsz = (size_t)min_t(unsigned long long,
665 m- 644 m->offset + m->size - start, size);
666 paddr = m->paddr + sta 645 paddr = m->paddr + start - m->offset;
667 if (vmcore_remap_oldme 646 if (vmcore_remap_oldmem_pfn(vma, vma->vm_start + len,
668 647 paddr >> PAGE_SHIFT, tsz,
669 648 vma->vm_page_prot))
670 goto fail; 649 goto fail;
671 size -= tsz; 650 size -= tsz;
672 start += tsz; 651 start += tsz;
673 len += tsz; 652 len += tsz;
674 653
675 if (size == 0) 654 if (size == 0)
676 return 0; 655 return 0;
677 } 656 }
678 } 657 }
679 658
680 return 0; 659 return 0;
681 fail: 660 fail:
682 do_munmap(vma->vm_mm, vma->vm_start, l 661 do_munmap(vma->vm_mm, vma->vm_start, len, NULL);
683 return -EAGAIN; 662 return -EAGAIN;
684 } 663 }
685 #else 664 #else
686 static int mmap_vmcore(struct file *file, stru 665 static int mmap_vmcore(struct file *file, struct vm_area_struct *vma)
687 { 666 {
688 return -ENOSYS; 667 return -ENOSYS;
689 } 668 }
690 #endif 669 #endif
691 670
692 static const struct proc_ops vmcore_proc_ops = 671 static const struct proc_ops vmcore_proc_ops = {
693 .proc_open = open_vmcore, !! 672 .proc_read = read_vmcore,
694 .proc_read_iter = read_vmcore, <<
695 .proc_lseek = default_llseek, 673 .proc_lseek = default_llseek,
696 .proc_mmap = mmap_vmcore, 674 .proc_mmap = mmap_vmcore,
697 }; 675 };
698 676
699 static struct vmcore* __init get_new_element(v 677 static struct vmcore* __init get_new_element(void)
700 { 678 {
701 return kzalloc(sizeof(struct vmcore), 679 return kzalloc(sizeof(struct vmcore), GFP_KERNEL);
702 } 680 }
703 681
704 static u64 get_vmcore_size(size_t elfsz, size_ 682 static u64 get_vmcore_size(size_t elfsz, size_t elfnotesegsz,
705 struct list_head *v 683 struct list_head *vc_list)
706 { 684 {
707 u64 size; 685 u64 size;
708 struct vmcore *m; 686 struct vmcore *m;
709 687
710 size = elfsz + elfnotesegsz; 688 size = elfsz + elfnotesegsz;
711 list_for_each_entry(m, vc_list, list) 689 list_for_each_entry(m, vc_list, list) {
712 size += m->size; 690 size += m->size;
713 } 691 }
714 return size; 692 return size;
715 } 693 }
716 694
717 /** 695 /**
718 * update_note_header_size_elf64 - update p_me 696 * update_note_header_size_elf64 - update p_memsz member of each PT_NOTE entry
719 * 697 *
720 * @ehdr_ptr: ELF header 698 * @ehdr_ptr: ELF header
721 * 699 *
722 * This function updates p_memsz member of eac 700 * This function updates p_memsz member of each PT_NOTE entry in the
723 * program header table pointed to by @ehdr_pt 701 * program header table pointed to by @ehdr_ptr to real size of ELF
724 * note segment. 702 * note segment.
725 */ 703 */
726 static int __init update_note_header_size_elf6 704 static int __init update_note_header_size_elf64(const Elf64_Ehdr *ehdr_ptr)
727 { 705 {
728 int i, rc=0; 706 int i, rc=0;
729 Elf64_Phdr *phdr_ptr; 707 Elf64_Phdr *phdr_ptr;
730 Elf64_Nhdr *nhdr_ptr; 708 Elf64_Nhdr *nhdr_ptr;
731 709
732 phdr_ptr = (Elf64_Phdr *)(ehdr_ptr + 1 710 phdr_ptr = (Elf64_Phdr *)(ehdr_ptr + 1);
733 for (i = 0; i < ehdr_ptr->e_phnum; i++ 711 for (i = 0; i < ehdr_ptr->e_phnum; i++, phdr_ptr++) {
734 void *notes_section; 712 void *notes_section;
735 u64 offset, max_sz, sz, real_s 713 u64 offset, max_sz, sz, real_sz = 0;
736 if (phdr_ptr->p_type != PT_NOT 714 if (phdr_ptr->p_type != PT_NOTE)
737 continue; 715 continue;
738 max_sz = phdr_ptr->p_memsz; 716 max_sz = phdr_ptr->p_memsz;
739 offset = phdr_ptr->p_offset; 717 offset = phdr_ptr->p_offset;
740 notes_section = kmalloc(max_sz 718 notes_section = kmalloc(max_sz, GFP_KERNEL);
741 if (!notes_section) 719 if (!notes_section)
742 return -ENOMEM; 720 return -ENOMEM;
743 rc = elfcorehdr_read_notes(not 721 rc = elfcorehdr_read_notes(notes_section, max_sz, &offset);
744 if (rc < 0) { 722 if (rc < 0) {
745 kfree(notes_section); 723 kfree(notes_section);
746 return rc; 724 return rc;
747 } 725 }
748 nhdr_ptr = notes_section; 726 nhdr_ptr = notes_section;
749 while (nhdr_ptr->n_namesz != 0 727 while (nhdr_ptr->n_namesz != 0) {
750 sz = sizeof(Elf64_Nhdr 728 sz = sizeof(Elf64_Nhdr) +
751 (((u64)nhdr_pt 729 (((u64)nhdr_ptr->n_namesz + 3) & ~3) +
752 (((u64)nhdr_pt 730 (((u64)nhdr_ptr->n_descsz + 3) & ~3);
753 if ((real_sz + sz) > m 731 if ((real_sz + sz) > max_sz) {
754 pr_warn("Warni 732 pr_warn("Warning: Exceeded p_memsz, dropping PT_NOTE entry n_namesz=0x%x, n_descsz=0x%x\n",
755 nhdr_p 733 nhdr_ptr->n_namesz, nhdr_ptr->n_descsz);
756 break; 734 break;
757 } 735 }
758 real_sz += sz; 736 real_sz += sz;
759 nhdr_ptr = (Elf64_Nhdr 737 nhdr_ptr = (Elf64_Nhdr*)((char*)nhdr_ptr + sz);
760 } 738 }
761 kfree(notes_section); 739 kfree(notes_section);
762 phdr_ptr->p_memsz = real_sz; 740 phdr_ptr->p_memsz = real_sz;
763 if (real_sz == 0) { 741 if (real_sz == 0) {
764 pr_warn("Warning: Zero 742 pr_warn("Warning: Zero PT_NOTE entries found\n");
765 } 743 }
766 } 744 }
767 745
768 return 0; 746 return 0;
769 } 747 }
770 748
771 /** 749 /**
772 * get_note_number_and_size_elf64 - get the nu 750 * get_note_number_and_size_elf64 - get the number of PT_NOTE program
773 * headers and sum of real size of their ELF n 751 * headers and sum of real size of their ELF note segment headers and
774 * data. 752 * data.
775 * 753 *
776 * @ehdr_ptr: ELF header 754 * @ehdr_ptr: ELF header
777 * @nr_ptnote: buffer for the number of PT_NOT 755 * @nr_ptnote: buffer for the number of PT_NOTE program headers
778 * @sz_ptnote: buffer for size of unique PT_NO 756 * @sz_ptnote: buffer for size of unique PT_NOTE program header
779 * 757 *
780 * This function is used to merge multiple PT_ 758 * This function is used to merge multiple PT_NOTE program headers
781 * into a unique single one. The resulting uni 759 * into a unique single one. The resulting unique entry will have
782 * @sz_ptnote in its phdr->p_mem. 760 * @sz_ptnote in its phdr->p_mem.
783 * 761 *
784 * It is assumed that program headers with PT_ 762 * It is assumed that program headers with PT_NOTE type pointed to by
785 * @ehdr_ptr has already been updated by updat 763 * @ehdr_ptr has already been updated by update_note_header_size_elf64
786 * and each of PT_NOTE program headers has act 764 * and each of PT_NOTE program headers has actual ELF note segment
787 * size in its p_memsz member. 765 * size in its p_memsz member.
788 */ 766 */
789 static int __init get_note_number_and_size_elf 767 static int __init get_note_number_and_size_elf64(const Elf64_Ehdr *ehdr_ptr,
790 768 int *nr_ptnote, u64 *sz_ptnote)
791 { 769 {
792 int i; 770 int i;
793 Elf64_Phdr *phdr_ptr; 771 Elf64_Phdr *phdr_ptr;
794 772
795 *nr_ptnote = *sz_ptnote = 0; 773 *nr_ptnote = *sz_ptnote = 0;
796 774
797 phdr_ptr = (Elf64_Phdr *)(ehdr_ptr + 1 775 phdr_ptr = (Elf64_Phdr *)(ehdr_ptr + 1);
798 for (i = 0; i < ehdr_ptr->e_phnum; i++ 776 for (i = 0; i < ehdr_ptr->e_phnum; i++, phdr_ptr++) {
799 if (phdr_ptr->p_type != PT_NOT 777 if (phdr_ptr->p_type != PT_NOTE)
800 continue; 778 continue;
801 *nr_ptnote += 1; 779 *nr_ptnote += 1;
802 *sz_ptnote += phdr_ptr->p_mems 780 *sz_ptnote += phdr_ptr->p_memsz;
803 } 781 }
804 782
805 return 0; 783 return 0;
806 } 784 }
807 785
808 /** 786 /**
809 * copy_notes_elf64 - copy ELF note segments i 787 * copy_notes_elf64 - copy ELF note segments in a given buffer
810 * 788 *
811 * @ehdr_ptr: ELF header 789 * @ehdr_ptr: ELF header
812 * @notes_buf: buffer into which ELF note segm 790 * @notes_buf: buffer into which ELF note segments are copied
813 * 791 *
814 * This function is used to copy ELF note segm 792 * This function is used to copy ELF note segment in the 1st kernel
815 * into the buffer @notes_buf in the 2nd kerne 793 * into the buffer @notes_buf in the 2nd kernel. It is assumed that
816 * size of the buffer @notes_buf is equal to o 794 * size of the buffer @notes_buf is equal to or larger than sum of the
817 * real ELF note segment headers and data. 795 * real ELF note segment headers and data.
818 * 796 *
819 * It is assumed that program headers with PT_ 797 * It is assumed that program headers with PT_NOTE type pointed to by
820 * @ehdr_ptr has already been updated by updat 798 * @ehdr_ptr has already been updated by update_note_header_size_elf64
821 * and each of PT_NOTE program headers has act 799 * and each of PT_NOTE program headers has actual ELF note segment
822 * size in its p_memsz member. 800 * size in its p_memsz member.
823 */ 801 */
824 static int __init copy_notes_elf64(const Elf64 802 static int __init copy_notes_elf64(const Elf64_Ehdr *ehdr_ptr, char *notes_buf)
825 { 803 {
826 int i, rc=0; 804 int i, rc=0;
827 Elf64_Phdr *phdr_ptr; 805 Elf64_Phdr *phdr_ptr;
828 806
829 phdr_ptr = (Elf64_Phdr*)(ehdr_ptr + 1) 807 phdr_ptr = (Elf64_Phdr*)(ehdr_ptr + 1);
830 808
831 for (i = 0; i < ehdr_ptr->e_phnum; i++ 809 for (i = 0; i < ehdr_ptr->e_phnum; i++, phdr_ptr++) {
832 u64 offset; 810 u64 offset;
833 if (phdr_ptr->p_type != PT_NOT 811 if (phdr_ptr->p_type != PT_NOTE)
834 continue; 812 continue;
835 offset = phdr_ptr->p_offset; 813 offset = phdr_ptr->p_offset;
836 rc = elfcorehdr_read_notes(not 814 rc = elfcorehdr_read_notes(notes_buf, phdr_ptr->p_memsz,
837 &of 815 &offset);
838 if (rc < 0) 816 if (rc < 0)
839 return rc; 817 return rc;
840 notes_buf += phdr_ptr->p_memsz 818 notes_buf += phdr_ptr->p_memsz;
841 } 819 }
842 820
843 return 0; 821 return 0;
844 } 822 }
845 823
846 /* Merges all the PT_NOTE headers into one. */ 824 /* Merges all the PT_NOTE headers into one. */
847 static int __init merge_note_headers_elf64(cha 825 static int __init merge_note_headers_elf64(char *elfptr, size_t *elfsz,
848 cha 826 char **notes_buf, size_t *notes_sz)
849 { 827 {
850 int i, nr_ptnote=0, rc=0; 828 int i, nr_ptnote=0, rc=0;
851 char *tmp; 829 char *tmp;
852 Elf64_Ehdr *ehdr_ptr; 830 Elf64_Ehdr *ehdr_ptr;
853 Elf64_Phdr phdr; 831 Elf64_Phdr phdr;
854 u64 phdr_sz = 0, note_off; 832 u64 phdr_sz = 0, note_off;
855 833
856 ehdr_ptr = (Elf64_Ehdr *)elfptr; 834 ehdr_ptr = (Elf64_Ehdr *)elfptr;
857 835
858 rc = update_note_header_size_elf64(ehd 836 rc = update_note_header_size_elf64(ehdr_ptr);
859 if (rc < 0) 837 if (rc < 0)
860 return rc; 838 return rc;
861 839
862 rc = get_note_number_and_size_elf64(eh 840 rc = get_note_number_and_size_elf64(ehdr_ptr, &nr_ptnote, &phdr_sz);
863 if (rc < 0) 841 if (rc < 0)
864 return rc; 842 return rc;
865 843
866 *notes_sz = roundup(phdr_sz, PAGE_SIZE 844 *notes_sz = roundup(phdr_sz, PAGE_SIZE);
867 *notes_buf = vmcore_alloc_buf(*notes_s 845 *notes_buf = vmcore_alloc_buf(*notes_sz);
868 if (!*notes_buf) 846 if (!*notes_buf)
869 return -ENOMEM; 847 return -ENOMEM;
870 848
871 rc = copy_notes_elf64(ehdr_ptr, *notes 849 rc = copy_notes_elf64(ehdr_ptr, *notes_buf);
872 if (rc < 0) 850 if (rc < 0)
873 return rc; 851 return rc;
874 852
875 /* Prepare merged PT_NOTE program head 853 /* Prepare merged PT_NOTE program header. */
876 phdr.p_type = PT_NOTE; 854 phdr.p_type = PT_NOTE;
877 phdr.p_flags = 0; 855 phdr.p_flags = 0;
878 note_off = sizeof(Elf64_Ehdr) + 856 note_off = sizeof(Elf64_Ehdr) +
879 (ehdr_ptr->e_phnum - n 857 (ehdr_ptr->e_phnum - nr_ptnote +1) * sizeof(Elf64_Phdr);
880 phdr.p_offset = roundup(note_off, PAG 858 phdr.p_offset = roundup(note_off, PAGE_SIZE);
881 phdr.p_vaddr = phdr.p_paddr = 0; 859 phdr.p_vaddr = phdr.p_paddr = 0;
882 phdr.p_filesz = phdr.p_memsz = phdr_s 860 phdr.p_filesz = phdr.p_memsz = phdr_sz;
883 phdr.p_align = 4; !! 861 phdr.p_align = 0;
884 862
885 /* Add merged PT_NOTE program header*/ 863 /* Add merged PT_NOTE program header*/
886 tmp = elfptr + sizeof(Elf64_Ehdr); 864 tmp = elfptr + sizeof(Elf64_Ehdr);
887 memcpy(tmp, &phdr, sizeof(phdr)); 865 memcpy(tmp, &phdr, sizeof(phdr));
888 tmp += sizeof(phdr); 866 tmp += sizeof(phdr);
889 867
890 /* Remove unwanted PT_NOTE program hea 868 /* Remove unwanted PT_NOTE program headers. */
891 i = (nr_ptnote - 1) * sizeof(Elf64_Phd 869 i = (nr_ptnote - 1) * sizeof(Elf64_Phdr);
892 *elfsz = *elfsz - i; 870 *elfsz = *elfsz - i;
893 memmove(tmp, tmp+i, ((*elfsz)-sizeof(E 871 memmove(tmp, tmp+i, ((*elfsz)-sizeof(Elf64_Ehdr)-sizeof(Elf64_Phdr)));
894 memset(elfptr + *elfsz, 0, i); 872 memset(elfptr + *elfsz, 0, i);
895 *elfsz = roundup(*elfsz, PAGE_SIZE); 873 *elfsz = roundup(*elfsz, PAGE_SIZE);
896 874
897 /* Modify e_phnum to reflect merged he 875 /* Modify e_phnum to reflect merged headers. */
898 ehdr_ptr->e_phnum = ehdr_ptr->e_phnum 876 ehdr_ptr->e_phnum = ehdr_ptr->e_phnum - nr_ptnote + 1;
899 877
900 /* Store the size of all notes. We ne 878 /* Store the size of all notes. We need this to update the note
901 * header when the device dumps will b 879 * header when the device dumps will be added.
902 */ 880 */
903 elfnotes_orig_sz = phdr.p_memsz; 881 elfnotes_orig_sz = phdr.p_memsz;
904 882
905 return 0; 883 return 0;
906 } 884 }
907 885
908 /** 886 /**
909 * update_note_header_size_elf32 - update p_me 887 * update_note_header_size_elf32 - update p_memsz member of each PT_NOTE entry
910 * 888 *
911 * @ehdr_ptr: ELF header 889 * @ehdr_ptr: ELF header
912 * 890 *
913 * This function updates p_memsz member of eac 891 * This function updates p_memsz member of each PT_NOTE entry in the
914 * program header table pointed to by @ehdr_pt 892 * program header table pointed to by @ehdr_ptr to real size of ELF
915 * note segment. 893 * note segment.
916 */ 894 */
917 static int __init update_note_header_size_elf3 895 static int __init update_note_header_size_elf32(const Elf32_Ehdr *ehdr_ptr)
918 { 896 {
919 int i, rc=0; 897 int i, rc=0;
920 Elf32_Phdr *phdr_ptr; 898 Elf32_Phdr *phdr_ptr;
921 Elf32_Nhdr *nhdr_ptr; 899 Elf32_Nhdr *nhdr_ptr;
922 900
923 phdr_ptr = (Elf32_Phdr *)(ehdr_ptr + 1 901 phdr_ptr = (Elf32_Phdr *)(ehdr_ptr + 1);
924 for (i = 0; i < ehdr_ptr->e_phnum; i++ 902 for (i = 0; i < ehdr_ptr->e_phnum; i++, phdr_ptr++) {
925 void *notes_section; 903 void *notes_section;
926 u64 offset, max_sz, sz, real_s 904 u64 offset, max_sz, sz, real_sz = 0;
927 if (phdr_ptr->p_type != PT_NOT 905 if (phdr_ptr->p_type != PT_NOTE)
928 continue; 906 continue;
929 max_sz = phdr_ptr->p_memsz; 907 max_sz = phdr_ptr->p_memsz;
930 offset = phdr_ptr->p_offset; 908 offset = phdr_ptr->p_offset;
931 notes_section = kmalloc(max_sz 909 notes_section = kmalloc(max_sz, GFP_KERNEL);
932 if (!notes_section) 910 if (!notes_section)
933 return -ENOMEM; 911 return -ENOMEM;
934 rc = elfcorehdr_read_notes(not 912 rc = elfcorehdr_read_notes(notes_section, max_sz, &offset);
935 if (rc < 0) { 913 if (rc < 0) {
936 kfree(notes_section); 914 kfree(notes_section);
937 return rc; 915 return rc;
938 } 916 }
939 nhdr_ptr = notes_section; 917 nhdr_ptr = notes_section;
940 while (nhdr_ptr->n_namesz != 0 918 while (nhdr_ptr->n_namesz != 0) {
941 sz = sizeof(Elf32_Nhdr 919 sz = sizeof(Elf32_Nhdr) +
942 (((u64)nhdr_pt 920 (((u64)nhdr_ptr->n_namesz + 3) & ~3) +
943 (((u64)nhdr_pt 921 (((u64)nhdr_ptr->n_descsz + 3) & ~3);
944 if ((real_sz + sz) > m 922 if ((real_sz + sz) > max_sz) {
945 pr_warn("Warni 923 pr_warn("Warning: Exceeded p_memsz, dropping PT_NOTE entry n_namesz=0x%x, n_descsz=0x%x\n",
946 nhdr_p 924 nhdr_ptr->n_namesz, nhdr_ptr->n_descsz);
947 break; 925 break;
948 } 926 }
949 real_sz += sz; 927 real_sz += sz;
950 nhdr_ptr = (Elf32_Nhdr 928 nhdr_ptr = (Elf32_Nhdr*)((char*)nhdr_ptr + sz);
951 } 929 }
952 kfree(notes_section); 930 kfree(notes_section);
953 phdr_ptr->p_memsz = real_sz; 931 phdr_ptr->p_memsz = real_sz;
954 if (real_sz == 0) { 932 if (real_sz == 0) {
955 pr_warn("Warning: Zero 933 pr_warn("Warning: Zero PT_NOTE entries found\n");
956 } 934 }
957 } 935 }
958 936
959 return 0; 937 return 0;
960 } 938 }
961 939
962 /** 940 /**
963 * get_note_number_and_size_elf32 - get the nu 941 * get_note_number_and_size_elf32 - get the number of PT_NOTE program
964 * headers and sum of real size of their ELF n 942 * headers and sum of real size of their ELF note segment headers and
965 * data. 943 * data.
966 * 944 *
967 * @ehdr_ptr: ELF header 945 * @ehdr_ptr: ELF header
968 * @nr_ptnote: buffer for the number of PT_NOT 946 * @nr_ptnote: buffer for the number of PT_NOTE program headers
969 * @sz_ptnote: buffer for size of unique PT_NO 947 * @sz_ptnote: buffer for size of unique PT_NOTE program header
970 * 948 *
971 * This function is used to merge multiple PT_ 949 * This function is used to merge multiple PT_NOTE program headers
972 * into a unique single one. The resulting uni 950 * into a unique single one. The resulting unique entry will have
973 * @sz_ptnote in its phdr->p_mem. 951 * @sz_ptnote in its phdr->p_mem.
974 * 952 *
975 * It is assumed that program headers with PT_ 953 * It is assumed that program headers with PT_NOTE type pointed to by
976 * @ehdr_ptr has already been updated by updat 954 * @ehdr_ptr has already been updated by update_note_header_size_elf32
977 * and each of PT_NOTE program headers has act 955 * and each of PT_NOTE program headers has actual ELF note segment
978 * size in its p_memsz member. 956 * size in its p_memsz member.
979 */ 957 */
980 static int __init get_note_number_and_size_elf 958 static int __init get_note_number_and_size_elf32(const Elf32_Ehdr *ehdr_ptr,
981 959 int *nr_ptnote, u64 *sz_ptnote)
982 { 960 {
983 int i; 961 int i;
984 Elf32_Phdr *phdr_ptr; 962 Elf32_Phdr *phdr_ptr;
985 963
986 *nr_ptnote = *sz_ptnote = 0; 964 *nr_ptnote = *sz_ptnote = 0;
987 965
988 phdr_ptr = (Elf32_Phdr *)(ehdr_ptr + 1 966 phdr_ptr = (Elf32_Phdr *)(ehdr_ptr + 1);
989 for (i = 0; i < ehdr_ptr->e_phnum; i++ 967 for (i = 0; i < ehdr_ptr->e_phnum; i++, phdr_ptr++) {
990 if (phdr_ptr->p_type != PT_NOT 968 if (phdr_ptr->p_type != PT_NOTE)
991 continue; 969 continue;
992 *nr_ptnote += 1; 970 *nr_ptnote += 1;
993 *sz_ptnote += phdr_ptr->p_mems 971 *sz_ptnote += phdr_ptr->p_memsz;
994 } 972 }
995 973
996 return 0; 974 return 0;
997 } 975 }
998 976
999 /** 977 /**
1000 * copy_notes_elf32 - copy ELF note segments 978 * copy_notes_elf32 - copy ELF note segments in a given buffer
1001 * 979 *
1002 * @ehdr_ptr: ELF header 980 * @ehdr_ptr: ELF header
1003 * @notes_buf: buffer into which ELF note seg 981 * @notes_buf: buffer into which ELF note segments are copied
1004 * 982 *
1005 * This function is used to copy ELF note seg 983 * This function is used to copy ELF note segment in the 1st kernel
1006 * into the buffer @notes_buf in the 2nd kern 984 * into the buffer @notes_buf in the 2nd kernel. It is assumed that
1007 * size of the buffer @notes_buf is equal to 985 * size of the buffer @notes_buf is equal to or larger than sum of the
1008 * real ELF note segment headers and data. 986 * real ELF note segment headers and data.
1009 * 987 *
1010 * It is assumed that program headers with PT 988 * It is assumed that program headers with PT_NOTE type pointed to by
1011 * @ehdr_ptr has already been updated by upda 989 * @ehdr_ptr has already been updated by update_note_header_size_elf32
1012 * and each of PT_NOTE program headers has ac 990 * and each of PT_NOTE program headers has actual ELF note segment
1013 * size in its p_memsz member. 991 * size in its p_memsz member.
1014 */ 992 */
1015 static int __init copy_notes_elf32(const Elf3 993 static int __init copy_notes_elf32(const Elf32_Ehdr *ehdr_ptr, char *notes_buf)
1016 { 994 {
1017 int i, rc=0; 995 int i, rc=0;
1018 Elf32_Phdr *phdr_ptr; 996 Elf32_Phdr *phdr_ptr;
1019 997
1020 phdr_ptr = (Elf32_Phdr*)(ehdr_ptr + 1 998 phdr_ptr = (Elf32_Phdr*)(ehdr_ptr + 1);
1021 999
1022 for (i = 0; i < ehdr_ptr->e_phnum; i+ 1000 for (i = 0; i < ehdr_ptr->e_phnum; i++, phdr_ptr++) {
1023 u64 offset; 1001 u64 offset;
1024 if (phdr_ptr->p_type != PT_NO 1002 if (phdr_ptr->p_type != PT_NOTE)
1025 continue; 1003 continue;
1026 offset = phdr_ptr->p_offset; 1004 offset = phdr_ptr->p_offset;
1027 rc = elfcorehdr_read_notes(no 1005 rc = elfcorehdr_read_notes(notes_buf, phdr_ptr->p_memsz,
1028 &o 1006 &offset);
1029 if (rc < 0) 1007 if (rc < 0)
1030 return rc; 1008 return rc;
1031 notes_buf += phdr_ptr->p_mems 1009 notes_buf += phdr_ptr->p_memsz;
1032 } 1010 }
1033 1011
1034 return 0; 1012 return 0;
1035 } 1013 }
1036 1014
1037 /* Merges all the PT_NOTE headers into one. * 1015 /* Merges all the PT_NOTE headers into one. */
1038 static int __init merge_note_headers_elf32(ch 1016 static int __init merge_note_headers_elf32(char *elfptr, size_t *elfsz,
1039 ch 1017 char **notes_buf, size_t *notes_sz)
1040 { 1018 {
1041 int i, nr_ptnote=0, rc=0; 1019 int i, nr_ptnote=0, rc=0;
1042 char *tmp; 1020 char *tmp;
1043 Elf32_Ehdr *ehdr_ptr; 1021 Elf32_Ehdr *ehdr_ptr;
1044 Elf32_Phdr phdr; 1022 Elf32_Phdr phdr;
1045 u64 phdr_sz = 0, note_off; 1023 u64 phdr_sz = 0, note_off;
1046 1024
1047 ehdr_ptr = (Elf32_Ehdr *)elfptr; 1025 ehdr_ptr = (Elf32_Ehdr *)elfptr;
1048 1026
1049 rc = update_note_header_size_elf32(eh 1027 rc = update_note_header_size_elf32(ehdr_ptr);
1050 if (rc < 0) 1028 if (rc < 0)
1051 return rc; 1029 return rc;
1052 1030
1053 rc = get_note_number_and_size_elf32(e 1031 rc = get_note_number_and_size_elf32(ehdr_ptr, &nr_ptnote, &phdr_sz);
1054 if (rc < 0) 1032 if (rc < 0)
1055 return rc; 1033 return rc;
1056 1034
1057 *notes_sz = roundup(phdr_sz, PAGE_SIZ 1035 *notes_sz = roundup(phdr_sz, PAGE_SIZE);
1058 *notes_buf = vmcore_alloc_buf(*notes_ 1036 *notes_buf = vmcore_alloc_buf(*notes_sz);
1059 if (!*notes_buf) 1037 if (!*notes_buf)
1060 return -ENOMEM; 1038 return -ENOMEM;
1061 1039
1062 rc = copy_notes_elf32(ehdr_ptr, *note 1040 rc = copy_notes_elf32(ehdr_ptr, *notes_buf);
1063 if (rc < 0) 1041 if (rc < 0)
1064 return rc; 1042 return rc;
1065 1043
1066 /* Prepare merged PT_NOTE program hea 1044 /* Prepare merged PT_NOTE program header. */
1067 phdr.p_type = PT_NOTE; 1045 phdr.p_type = PT_NOTE;
1068 phdr.p_flags = 0; 1046 phdr.p_flags = 0;
1069 note_off = sizeof(Elf32_Ehdr) + 1047 note_off = sizeof(Elf32_Ehdr) +
1070 (ehdr_ptr->e_phnum - 1048 (ehdr_ptr->e_phnum - nr_ptnote +1) * sizeof(Elf32_Phdr);
1071 phdr.p_offset = roundup(note_off, PA 1049 phdr.p_offset = roundup(note_off, PAGE_SIZE);
1072 phdr.p_vaddr = phdr.p_paddr = 0; 1050 phdr.p_vaddr = phdr.p_paddr = 0;
1073 phdr.p_filesz = phdr.p_memsz = phdr_ 1051 phdr.p_filesz = phdr.p_memsz = phdr_sz;
1074 phdr.p_align = 4; !! 1052 phdr.p_align = 0;
1075 1053
1076 /* Add merged PT_NOTE program header* 1054 /* Add merged PT_NOTE program header*/
1077 tmp = elfptr + sizeof(Elf32_Ehdr); 1055 tmp = elfptr + sizeof(Elf32_Ehdr);
1078 memcpy(tmp, &phdr, sizeof(phdr)); 1056 memcpy(tmp, &phdr, sizeof(phdr));
1079 tmp += sizeof(phdr); 1057 tmp += sizeof(phdr);
1080 1058
1081 /* Remove unwanted PT_NOTE program he 1059 /* Remove unwanted PT_NOTE program headers. */
1082 i = (nr_ptnote - 1) * sizeof(Elf32_Ph 1060 i = (nr_ptnote - 1) * sizeof(Elf32_Phdr);
1083 *elfsz = *elfsz - i; 1061 *elfsz = *elfsz - i;
1084 memmove(tmp, tmp+i, ((*elfsz)-sizeof( 1062 memmove(tmp, tmp+i, ((*elfsz)-sizeof(Elf32_Ehdr)-sizeof(Elf32_Phdr)));
1085 memset(elfptr + *elfsz, 0, i); 1063 memset(elfptr + *elfsz, 0, i);
1086 *elfsz = roundup(*elfsz, PAGE_SIZE); 1064 *elfsz = roundup(*elfsz, PAGE_SIZE);
1087 1065
1088 /* Modify e_phnum to reflect merged h 1066 /* Modify e_phnum to reflect merged headers. */
1089 ehdr_ptr->e_phnum = ehdr_ptr->e_phnum 1067 ehdr_ptr->e_phnum = ehdr_ptr->e_phnum - nr_ptnote + 1;
1090 1068
1091 /* Store the size of all notes. We n 1069 /* Store the size of all notes. We need this to update the note
1092 * header when the device dumps will 1070 * header when the device dumps will be added.
1093 */ 1071 */
1094 elfnotes_orig_sz = phdr.p_memsz; 1072 elfnotes_orig_sz = phdr.p_memsz;
1095 1073
1096 return 0; 1074 return 0;
1097 } 1075 }
1098 1076
1099 /* Add memory chunks represented by program h 1077 /* Add memory chunks represented by program headers to vmcore list. Also update
1100 * the new offset fields of exported program 1078 * the new offset fields of exported program headers. */
1101 static int __init process_ptload_program_head 1079 static int __init process_ptload_program_headers_elf64(char *elfptr,
1102 1080 size_t elfsz,
1103 1081 size_t elfnotes_sz,
1104 1082 struct list_head *vc_list)
1105 { 1083 {
1106 int i; 1084 int i;
1107 Elf64_Ehdr *ehdr_ptr; 1085 Elf64_Ehdr *ehdr_ptr;
1108 Elf64_Phdr *phdr_ptr; 1086 Elf64_Phdr *phdr_ptr;
1109 loff_t vmcore_off; 1087 loff_t vmcore_off;
1110 struct vmcore *new; 1088 struct vmcore *new;
1111 1089
1112 ehdr_ptr = (Elf64_Ehdr *)elfptr; 1090 ehdr_ptr = (Elf64_Ehdr *)elfptr;
1113 phdr_ptr = (Elf64_Phdr*)(elfptr + siz 1091 phdr_ptr = (Elf64_Phdr*)(elfptr + sizeof(Elf64_Ehdr)); /* PT_NOTE hdr */
1114 1092
1115 /* Skip ELF header, program headers a !! 1093 /* Skip Elf header, program headers and Elf note segment. */
1116 vmcore_off = elfsz + elfnotes_sz; 1094 vmcore_off = elfsz + elfnotes_sz;
1117 1095
1118 for (i = 0; i < ehdr_ptr->e_phnum; i+ 1096 for (i = 0; i < ehdr_ptr->e_phnum; i++, phdr_ptr++) {
1119 u64 paddr, start, end, size; 1097 u64 paddr, start, end, size;
1120 1098
1121 if (phdr_ptr->p_type != PT_LO 1099 if (phdr_ptr->p_type != PT_LOAD)
1122 continue; 1100 continue;
1123 1101
1124 paddr = phdr_ptr->p_offset; 1102 paddr = phdr_ptr->p_offset;
1125 start = rounddown(paddr, PAGE 1103 start = rounddown(paddr, PAGE_SIZE);
1126 end = roundup(paddr + phdr_pt 1104 end = roundup(paddr + phdr_ptr->p_memsz, PAGE_SIZE);
1127 size = end - start; 1105 size = end - start;
1128 1106
1129 /* Add this contiguous chunk 1107 /* Add this contiguous chunk of memory to vmcore list.*/
1130 new = get_new_element(); 1108 new = get_new_element();
1131 if (!new) 1109 if (!new)
1132 return -ENOMEM; 1110 return -ENOMEM;
1133 new->paddr = start; 1111 new->paddr = start;
1134 new->size = size; 1112 new->size = size;
1135 list_add_tail(&new->list, vc_ 1113 list_add_tail(&new->list, vc_list);
1136 1114
1137 /* Update the program header 1115 /* Update the program header offset. */
1138 phdr_ptr->p_offset = vmcore_o 1116 phdr_ptr->p_offset = vmcore_off + (paddr - start);
1139 vmcore_off = vmcore_off + siz 1117 vmcore_off = vmcore_off + size;
1140 } 1118 }
1141 return 0; 1119 return 0;
1142 } 1120 }
1143 1121
1144 static int __init process_ptload_program_head 1122 static int __init process_ptload_program_headers_elf32(char *elfptr,
1145 1123 size_t elfsz,
1146 1124 size_t elfnotes_sz,
1147 1125 struct list_head *vc_list)
1148 { 1126 {
1149 int i; 1127 int i;
1150 Elf32_Ehdr *ehdr_ptr; 1128 Elf32_Ehdr *ehdr_ptr;
1151 Elf32_Phdr *phdr_ptr; 1129 Elf32_Phdr *phdr_ptr;
1152 loff_t vmcore_off; 1130 loff_t vmcore_off;
1153 struct vmcore *new; 1131 struct vmcore *new;
1154 1132
1155 ehdr_ptr = (Elf32_Ehdr *)elfptr; 1133 ehdr_ptr = (Elf32_Ehdr *)elfptr;
1156 phdr_ptr = (Elf32_Phdr*)(elfptr + siz 1134 phdr_ptr = (Elf32_Phdr*)(elfptr + sizeof(Elf32_Ehdr)); /* PT_NOTE hdr */
1157 1135
1158 /* Skip ELF header, program headers a !! 1136 /* Skip Elf header, program headers and Elf note segment. */
1159 vmcore_off = elfsz + elfnotes_sz; 1137 vmcore_off = elfsz + elfnotes_sz;
1160 1138
1161 for (i = 0; i < ehdr_ptr->e_phnum; i+ 1139 for (i = 0; i < ehdr_ptr->e_phnum; i++, phdr_ptr++) {
1162 u64 paddr, start, end, size; 1140 u64 paddr, start, end, size;
1163 1141
1164 if (phdr_ptr->p_type != PT_LO 1142 if (phdr_ptr->p_type != PT_LOAD)
1165 continue; 1143 continue;
1166 1144
1167 paddr = phdr_ptr->p_offset; 1145 paddr = phdr_ptr->p_offset;
1168 start = rounddown(paddr, PAGE 1146 start = rounddown(paddr, PAGE_SIZE);
1169 end = roundup(paddr + phdr_pt 1147 end = roundup(paddr + phdr_ptr->p_memsz, PAGE_SIZE);
1170 size = end - start; 1148 size = end - start;
1171 1149
1172 /* Add this contiguous chunk 1150 /* Add this contiguous chunk of memory to vmcore list.*/
1173 new = get_new_element(); 1151 new = get_new_element();
1174 if (!new) 1152 if (!new)
1175 return -ENOMEM; 1153 return -ENOMEM;
1176 new->paddr = start; 1154 new->paddr = start;
1177 new->size = size; 1155 new->size = size;
1178 list_add_tail(&new->list, vc_ 1156 list_add_tail(&new->list, vc_list);
1179 1157
1180 /* Update the program header 1158 /* Update the program header offset */
1181 phdr_ptr->p_offset = vmcore_o 1159 phdr_ptr->p_offset = vmcore_off + (paddr - start);
1182 vmcore_off = vmcore_off + siz 1160 vmcore_off = vmcore_off + size;
1183 } 1161 }
1184 return 0; 1162 return 0;
1185 } 1163 }
1186 1164
1187 /* Sets offset fields of vmcore elements. */ 1165 /* Sets offset fields of vmcore elements. */
1188 static void set_vmcore_list_offsets(size_t el 1166 static void set_vmcore_list_offsets(size_t elfsz, size_t elfnotes_sz,
1189 struct li 1167 struct list_head *vc_list)
1190 { 1168 {
1191 loff_t vmcore_off; 1169 loff_t vmcore_off;
1192 struct vmcore *m; 1170 struct vmcore *m;
1193 1171
1194 /* Skip ELF header, program headers a !! 1172 /* Skip Elf header, program headers and Elf note segment. */
1195 vmcore_off = elfsz + elfnotes_sz; 1173 vmcore_off = elfsz + elfnotes_sz;
1196 1174
1197 list_for_each_entry(m, vc_list, list) 1175 list_for_each_entry(m, vc_list, list) {
1198 m->offset = vmcore_off; 1176 m->offset = vmcore_off;
1199 vmcore_off += m->size; 1177 vmcore_off += m->size;
1200 } 1178 }
1201 } 1179 }
1202 1180
1203 static void free_elfcorebuf(void) 1181 static void free_elfcorebuf(void)
1204 { 1182 {
1205 free_pages((unsigned long)elfcorebuf, 1183 free_pages((unsigned long)elfcorebuf, get_order(elfcorebuf_sz_orig));
1206 elfcorebuf = NULL; 1184 elfcorebuf = NULL;
1207 vfree(elfnotes_buf); 1185 vfree(elfnotes_buf);
1208 elfnotes_buf = NULL; 1186 elfnotes_buf = NULL;
1209 } 1187 }
1210 1188
1211 static int __init parse_crash_elf64_headers(v 1189 static int __init parse_crash_elf64_headers(void)
1212 { 1190 {
1213 int rc=0; 1191 int rc=0;
1214 Elf64_Ehdr ehdr; 1192 Elf64_Ehdr ehdr;
1215 u64 addr; 1193 u64 addr;
1216 1194
1217 addr = elfcorehdr_addr; 1195 addr = elfcorehdr_addr;
1218 1196
1219 /* Read ELF header */ !! 1197 /* Read Elf header */
1220 rc = elfcorehdr_read((char *)&ehdr, s 1198 rc = elfcorehdr_read((char *)&ehdr, sizeof(Elf64_Ehdr), &addr);
1221 if (rc < 0) 1199 if (rc < 0)
1222 return rc; 1200 return rc;
1223 1201
1224 /* Do some basic Verification. */ 1202 /* Do some basic Verification. */
1225 if (memcmp(ehdr.e_ident, ELFMAG, SELF 1203 if (memcmp(ehdr.e_ident, ELFMAG, SELFMAG) != 0 ||
1226 (ehdr.e_type != ET_CORE) || 1204 (ehdr.e_type != ET_CORE) ||
1227 !vmcore_elf64_check_arch(&ehd 1205 !vmcore_elf64_check_arch(&ehdr) ||
1228 ehdr.e_ident[EI_CLASS] != ELF 1206 ehdr.e_ident[EI_CLASS] != ELFCLASS64 ||
1229 ehdr.e_ident[EI_VERSION] != E 1207 ehdr.e_ident[EI_VERSION] != EV_CURRENT ||
1230 ehdr.e_version != EV_CURRENT 1208 ehdr.e_version != EV_CURRENT ||
1231 ehdr.e_ehsize != sizeof(Elf64 1209 ehdr.e_ehsize != sizeof(Elf64_Ehdr) ||
1232 ehdr.e_phentsize != sizeof(El 1210 ehdr.e_phentsize != sizeof(Elf64_Phdr) ||
1233 ehdr.e_phnum == 0) { 1211 ehdr.e_phnum == 0) {
1234 pr_warn("Warning: Core image 1212 pr_warn("Warning: Core image elf header is not sane\n");
1235 return -EINVAL; 1213 return -EINVAL;
1236 } 1214 }
1237 1215
1238 /* Read in all elf headers. */ 1216 /* Read in all elf headers. */
1239 elfcorebuf_sz_orig = sizeof(Elf64_Ehd 1217 elfcorebuf_sz_orig = sizeof(Elf64_Ehdr) +
1240 ehdr.e_phnum 1218 ehdr.e_phnum * sizeof(Elf64_Phdr);
1241 elfcorebuf_sz = elfcorebuf_sz_orig; 1219 elfcorebuf_sz = elfcorebuf_sz_orig;
1242 elfcorebuf = (void *)__get_free_pages 1220 elfcorebuf = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO,
1243 1221 get_order(elfcorebuf_sz_orig));
1244 if (!elfcorebuf) 1222 if (!elfcorebuf)
1245 return -ENOMEM; 1223 return -ENOMEM;
1246 addr = elfcorehdr_addr; 1224 addr = elfcorehdr_addr;
1247 rc = elfcorehdr_read(elfcorebuf, elfc 1225 rc = elfcorehdr_read(elfcorebuf, elfcorebuf_sz_orig, &addr);
1248 if (rc < 0) 1226 if (rc < 0)
1249 goto fail; 1227 goto fail;
1250 1228
1251 /* Merge all PT_NOTE headers into one 1229 /* Merge all PT_NOTE headers into one. */
1252 rc = merge_note_headers_elf64(elfcore 1230 rc = merge_note_headers_elf64(elfcorebuf, &elfcorebuf_sz,
1253 &elfnot 1231 &elfnotes_buf, &elfnotes_sz);
1254 if (rc) 1232 if (rc)
1255 goto fail; 1233 goto fail;
1256 rc = process_ptload_program_headers_e 1234 rc = process_ptload_program_headers_elf64(elfcorebuf, elfcorebuf_sz,
1257 1235 elfnotes_sz, &vmcore_list);
1258 if (rc) 1236 if (rc)
1259 goto fail; 1237 goto fail;
1260 set_vmcore_list_offsets(elfcorebuf_sz 1238 set_vmcore_list_offsets(elfcorebuf_sz, elfnotes_sz, &vmcore_list);
1261 return 0; 1239 return 0;
1262 fail: 1240 fail:
1263 free_elfcorebuf(); 1241 free_elfcorebuf();
1264 return rc; 1242 return rc;
1265 } 1243 }
1266 1244
1267 static int __init parse_crash_elf32_headers(v 1245 static int __init parse_crash_elf32_headers(void)
1268 { 1246 {
1269 int rc=0; 1247 int rc=0;
1270 Elf32_Ehdr ehdr; 1248 Elf32_Ehdr ehdr;
1271 u64 addr; 1249 u64 addr;
1272 1250
1273 addr = elfcorehdr_addr; 1251 addr = elfcorehdr_addr;
1274 1252
1275 /* Read ELF header */ !! 1253 /* Read Elf header */
1276 rc = elfcorehdr_read((char *)&ehdr, s 1254 rc = elfcorehdr_read((char *)&ehdr, sizeof(Elf32_Ehdr), &addr);
1277 if (rc < 0) 1255 if (rc < 0)
1278 return rc; 1256 return rc;
1279 1257
1280 /* Do some basic Verification. */ 1258 /* Do some basic Verification. */
1281 if (memcmp(ehdr.e_ident, ELFMAG, SELF 1259 if (memcmp(ehdr.e_ident, ELFMAG, SELFMAG) != 0 ||
1282 (ehdr.e_type != ET_CORE) || 1260 (ehdr.e_type != ET_CORE) ||
1283 !vmcore_elf32_check_arch(&ehd 1261 !vmcore_elf32_check_arch(&ehdr) ||
1284 ehdr.e_ident[EI_CLASS] != ELF 1262 ehdr.e_ident[EI_CLASS] != ELFCLASS32||
1285 ehdr.e_ident[EI_VERSION] != E 1263 ehdr.e_ident[EI_VERSION] != EV_CURRENT ||
1286 ehdr.e_version != EV_CURRENT 1264 ehdr.e_version != EV_CURRENT ||
1287 ehdr.e_ehsize != sizeof(Elf32 1265 ehdr.e_ehsize != sizeof(Elf32_Ehdr) ||
1288 ehdr.e_phentsize != sizeof(El 1266 ehdr.e_phentsize != sizeof(Elf32_Phdr) ||
1289 ehdr.e_phnum == 0) { 1267 ehdr.e_phnum == 0) {
1290 pr_warn("Warning: Core image 1268 pr_warn("Warning: Core image elf header is not sane\n");
1291 return -EINVAL; 1269 return -EINVAL;
1292 } 1270 }
1293 1271
1294 /* Read in all elf headers. */ 1272 /* Read in all elf headers. */
1295 elfcorebuf_sz_orig = sizeof(Elf32_Ehd 1273 elfcorebuf_sz_orig = sizeof(Elf32_Ehdr) + ehdr.e_phnum * sizeof(Elf32_Phdr);
1296 elfcorebuf_sz = elfcorebuf_sz_orig; 1274 elfcorebuf_sz = elfcorebuf_sz_orig;
1297 elfcorebuf = (void *)__get_free_pages 1275 elfcorebuf = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO,
1298 1276 get_order(elfcorebuf_sz_orig));
1299 if (!elfcorebuf) 1277 if (!elfcorebuf)
1300 return -ENOMEM; 1278 return -ENOMEM;
1301 addr = elfcorehdr_addr; 1279 addr = elfcorehdr_addr;
1302 rc = elfcorehdr_read(elfcorebuf, elfc 1280 rc = elfcorehdr_read(elfcorebuf, elfcorebuf_sz_orig, &addr);
1303 if (rc < 0) 1281 if (rc < 0)
1304 goto fail; 1282 goto fail;
1305 1283
1306 /* Merge all PT_NOTE headers into one 1284 /* Merge all PT_NOTE headers into one. */
1307 rc = merge_note_headers_elf32(elfcore 1285 rc = merge_note_headers_elf32(elfcorebuf, &elfcorebuf_sz,
1308 &elfnot 1286 &elfnotes_buf, &elfnotes_sz);
1309 if (rc) 1287 if (rc)
1310 goto fail; 1288 goto fail;
1311 rc = process_ptload_program_headers_e 1289 rc = process_ptload_program_headers_elf32(elfcorebuf, elfcorebuf_sz,
1312 1290 elfnotes_sz, &vmcore_list);
1313 if (rc) 1291 if (rc)
1314 goto fail; 1292 goto fail;
1315 set_vmcore_list_offsets(elfcorebuf_sz 1293 set_vmcore_list_offsets(elfcorebuf_sz, elfnotes_sz, &vmcore_list);
1316 return 0; 1294 return 0;
1317 fail: 1295 fail:
1318 free_elfcorebuf(); 1296 free_elfcorebuf();
1319 return rc; 1297 return rc;
1320 } 1298 }
1321 1299
1322 static int __init parse_crash_elf_headers(voi 1300 static int __init parse_crash_elf_headers(void)
1323 { 1301 {
1324 unsigned char e_ident[EI_NIDENT]; 1302 unsigned char e_ident[EI_NIDENT];
1325 u64 addr; 1303 u64 addr;
1326 int rc=0; 1304 int rc=0;
1327 1305
1328 addr = elfcorehdr_addr; 1306 addr = elfcorehdr_addr;
1329 rc = elfcorehdr_read(e_ident, EI_NIDE 1307 rc = elfcorehdr_read(e_ident, EI_NIDENT, &addr);
1330 if (rc < 0) 1308 if (rc < 0)
1331 return rc; 1309 return rc;
1332 if (memcmp(e_ident, ELFMAG, SELFMAG) 1310 if (memcmp(e_ident, ELFMAG, SELFMAG) != 0) {
1333 pr_warn("Warning: Core image 1311 pr_warn("Warning: Core image elf header not found\n");
1334 return -EINVAL; 1312 return -EINVAL;
1335 } 1313 }
1336 1314
1337 if (e_ident[EI_CLASS] == ELFCLASS64) 1315 if (e_ident[EI_CLASS] == ELFCLASS64) {
1338 rc = parse_crash_elf64_header 1316 rc = parse_crash_elf64_headers();
1339 if (rc) 1317 if (rc)
1340 return rc; 1318 return rc;
1341 } else if (e_ident[EI_CLASS] == ELFCL 1319 } else if (e_ident[EI_CLASS] == ELFCLASS32) {
1342 rc = parse_crash_elf32_header 1320 rc = parse_crash_elf32_headers();
1343 if (rc) 1321 if (rc)
1344 return rc; 1322 return rc;
1345 } else { 1323 } else {
1346 pr_warn("Warning: Core image 1324 pr_warn("Warning: Core image elf header is not sane\n");
1347 return -EINVAL; 1325 return -EINVAL;
1348 } 1326 }
1349 1327
1350 /* Determine vmcore size. */ 1328 /* Determine vmcore size. */
1351 vmcore_size = get_vmcore_size(elfcore 1329 vmcore_size = get_vmcore_size(elfcorebuf_sz, elfnotes_sz,
1352 &vmcore 1330 &vmcore_list);
1353 1331
1354 return 0; 1332 return 0;
1355 } 1333 }
1356 1334
1357 #ifdef CONFIG_PROC_VMCORE_DEVICE_DUMP 1335 #ifdef CONFIG_PROC_VMCORE_DEVICE_DUMP
1358 /** 1336 /**
1359 * vmcoredd_write_header - Write vmcore devic 1337 * vmcoredd_write_header - Write vmcore device dump header at the
1360 * beginning of the dump's buffer. 1338 * beginning of the dump's buffer.
1361 * @buf: Output buffer where the note is writ 1339 * @buf: Output buffer where the note is written
1362 * @data: Dump info 1340 * @data: Dump info
1363 * @size: Size of the dump 1341 * @size: Size of the dump
1364 * 1342 *
1365 * Fills beginning of the dump's buffer with 1343 * Fills beginning of the dump's buffer with vmcore device dump header.
1366 */ 1344 */
1367 static void vmcoredd_write_header(void *buf, 1345 static void vmcoredd_write_header(void *buf, struct vmcoredd_data *data,
1368 u32 size) 1346 u32 size)
1369 { 1347 {
1370 struct vmcoredd_header *vdd_hdr = (st 1348 struct vmcoredd_header *vdd_hdr = (struct vmcoredd_header *)buf;
1371 1349
1372 vdd_hdr->n_namesz = sizeof(vdd_hdr->n 1350 vdd_hdr->n_namesz = sizeof(vdd_hdr->name);
1373 vdd_hdr->n_descsz = size + sizeof(vdd 1351 vdd_hdr->n_descsz = size + sizeof(vdd_hdr->dump_name);
1374 vdd_hdr->n_type = NT_VMCOREDD; 1352 vdd_hdr->n_type = NT_VMCOREDD;
1375 1353
1376 strscpy_pad(vdd_hdr->name, VMCOREDD_N !! 1354 strncpy((char *)vdd_hdr->name, VMCOREDD_NOTE_NAME,
1377 strscpy_pad(vdd_hdr->dump_name, data- !! 1355 sizeof(vdd_hdr->name));
>> 1356 memcpy(vdd_hdr->dump_name, data->dump_name, sizeof(vdd_hdr->dump_name));
1378 } 1357 }
1379 1358
1380 /** 1359 /**
1381 * vmcoredd_update_program_headers - Update a !! 1360 * vmcoredd_update_program_headers - Update all Elf program headers
1382 * @elfptr: Pointer to elf header 1361 * @elfptr: Pointer to elf header
1383 * @elfnotesz: Size of elf notes aligned to p 1362 * @elfnotesz: Size of elf notes aligned to page size
1384 * @vmcoreddsz: Size of device dumps to be ad 1363 * @vmcoreddsz: Size of device dumps to be added to elf note header
1385 * 1364 *
1386 * Determine type of ELF header (Elf64 or Elf !! 1365 * Determine type of Elf header (Elf64 or Elf32) and update the elf note size.
1387 * Also update the offsets of all the program 1366 * Also update the offsets of all the program headers after the elf note header.
1388 */ 1367 */
1389 static void vmcoredd_update_program_headers(c 1368 static void vmcoredd_update_program_headers(char *elfptr, size_t elfnotesz,
1390 s 1369 size_t vmcoreddsz)
1391 { 1370 {
1392 unsigned char *e_ident = (unsigned ch 1371 unsigned char *e_ident = (unsigned char *)elfptr;
1393 u64 start, end, size; 1372 u64 start, end, size;
1394 loff_t vmcore_off; 1373 loff_t vmcore_off;
1395 u32 i; 1374 u32 i;
1396 1375
1397 vmcore_off = elfcorebuf_sz + elfnotes 1376 vmcore_off = elfcorebuf_sz + elfnotesz;
1398 1377
1399 if (e_ident[EI_CLASS] == ELFCLASS64) 1378 if (e_ident[EI_CLASS] == ELFCLASS64) {
1400 Elf64_Ehdr *ehdr = (Elf64_Ehd 1379 Elf64_Ehdr *ehdr = (Elf64_Ehdr *)elfptr;
1401 Elf64_Phdr *phdr = (Elf64_Phd 1380 Elf64_Phdr *phdr = (Elf64_Phdr *)(elfptr + sizeof(Elf64_Ehdr));
1402 1381
1403 /* Update all program headers 1382 /* Update all program headers */
1404 for (i = 0; i < ehdr->e_phnum 1383 for (i = 0; i < ehdr->e_phnum; i++, phdr++) {
1405 if (phdr->p_type == P 1384 if (phdr->p_type == PT_NOTE) {
1406 /* Update not 1385 /* Update note size */
1407 phdr->p_memsz 1386 phdr->p_memsz = elfnotes_orig_sz + vmcoreddsz;
1408 phdr->p_files 1387 phdr->p_filesz = phdr->p_memsz;
1409 continue; 1388 continue;
1410 } 1389 }
1411 1390
1412 start = rounddown(phd 1391 start = rounddown(phdr->p_offset, PAGE_SIZE);
1413 end = roundup(phdr->p 1392 end = roundup(phdr->p_offset + phdr->p_memsz,
1414 PAGE_SI 1393 PAGE_SIZE);
1415 size = end - start; 1394 size = end - start;
1416 phdr->p_offset = vmco 1395 phdr->p_offset = vmcore_off + (phdr->p_offset - start);
1417 vmcore_off += size; 1396 vmcore_off += size;
1418 } 1397 }
1419 } else { 1398 } else {
1420 Elf32_Ehdr *ehdr = (Elf32_Ehd 1399 Elf32_Ehdr *ehdr = (Elf32_Ehdr *)elfptr;
1421 Elf32_Phdr *phdr = (Elf32_Phd 1400 Elf32_Phdr *phdr = (Elf32_Phdr *)(elfptr + sizeof(Elf32_Ehdr));
1422 1401
1423 /* Update all program headers 1402 /* Update all program headers */
1424 for (i = 0; i < ehdr->e_phnum 1403 for (i = 0; i < ehdr->e_phnum; i++, phdr++) {
1425 if (phdr->p_type == P 1404 if (phdr->p_type == PT_NOTE) {
1426 /* Update not 1405 /* Update note size */
1427 phdr->p_memsz 1406 phdr->p_memsz = elfnotes_orig_sz + vmcoreddsz;
1428 phdr->p_files 1407 phdr->p_filesz = phdr->p_memsz;
1429 continue; 1408 continue;
1430 } 1409 }
1431 1410
1432 start = rounddown(phd 1411 start = rounddown(phdr->p_offset, PAGE_SIZE);
1433 end = roundup(phdr->p 1412 end = roundup(phdr->p_offset + phdr->p_memsz,
1434 PAGE_SI 1413 PAGE_SIZE);
1435 size = end - start; 1414 size = end - start;
1436 phdr->p_offset = vmco 1415 phdr->p_offset = vmcore_off + (phdr->p_offset - start);
1437 vmcore_off += size; 1416 vmcore_off += size;
1438 } 1417 }
1439 } 1418 }
1440 } 1419 }
1441 1420
1442 /** 1421 /**
1443 * vmcoredd_update_size - Update the total si 1422 * vmcoredd_update_size - Update the total size of the device dumps and update
1444 * ELF header !! 1423 * Elf header
1445 * @dump_size: Size of the current device dum 1424 * @dump_size: Size of the current device dump to be added to total size
1446 * 1425 *
1447 * Update the total size of all the device du !! 1426 * Update the total size of all the device dumps and update the Elf program
1448 * headers. Calculate the new offsets for the 1427 * headers. Calculate the new offsets for the vmcore list and update the
1449 * total vmcore size. 1428 * total vmcore size.
1450 */ 1429 */
1451 static void vmcoredd_update_size(size_t dump_ 1430 static void vmcoredd_update_size(size_t dump_size)
1452 { 1431 {
1453 vmcoredd_orig_sz += dump_size; 1432 vmcoredd_orig_sz += dump_size;
1454 elfnotes_sz = roundup(elfnotes_orig_s 1433 elfnotes_sz = roundup(elfnotes_orig_sz, PAGE_SIZE) + vmcoredd_orig_sz;
1455 vmcoredd_update_program_headers(elfco 1434 vmcoredd_update_program_headers(elfcorebuf, elfnotes_sz,
1456 vmcor 1435 vmcoredd_orig_sz);
1457 1436
1458 /* Update vmcore list offsets */ 1437 /* Update vmcore list offsets */
1459 set_vmcore_list_offsets(elfcorebuf_sz 1438 set_vmcore_list_offsets(elfcorebuf_sz, elfnotes_sz, &vmcore_list);
1460 1439
1461 vmcore_size = get_vmcore_size(elfcore 1440 vmcore_size = get_vmcore_size(elfcorebuf_sz, elfnotes_sz,
1462 &vmcore 1441 &vmcore_list);
1463 proc_vmcore->size = vmcore_size; 1442 proc_vmcore->size = vmcore_size;
1464 } 1443 }
1465 1444
1466 /** 1445 /**
1467 * vmcore_add_device_dump - Add a buffer cont 1446 * vmcore_add_device_dump - Add a buffer containing device dump to vmcore
1468 * @data: dump info. 1447 * @data: dump info.
1469 * 1448 *
1470 * Allocate a buffer and invoke the calling d 1449 * Allocate a buffer and invoke the calling driver's dump collect routine.
1471 * Write ELF note at the beginning of the buf !! 1450 * Write Elf note at the beginning of the buffer to indicate vmcore device
1472 * dump and add the dump to global list. 1451 * dump and add the dump to global list.
1473 */ 1452 */
1474 int vmcore_add_device_dump(struct vmcoredd_da 1453 int vmcore_add_device_dump(struct vmcoredd_data *data)
1475 { 1454 {
1476 struct vmcoredd_node *dump; 1455 struct vmcoredd_node *dump;
1477 void *buf = NULL; 1456 void *buf = NULL;
1478 size_t data_size; 1457 size_t data_size;
1479 int ret; 1458 int ret;
1480 1459
1481 if (vmcoredd_disabled) { 1460 if (vmcoredd_disabled) {
1482 pr_err_once("Device dump is d 1461 pr_err_once("Device dump is disabled\n");
1483 return -EINVAL; 1462 return -EINVAL;
1484 } 1463 }
1485 1464
1486 if (!data || !strlen(data->dump_name) 1465 if (!data || !strlen(data->dump_name) ||
1487 !data->vmcoredd_callback || !data 1466 !data->vmcoredd_callback || !data->size)
1488 return -EINVAL; 1467 return -EINVAL;
1489 1468
1490 dump = vzalloc(sizeof(*dump)); 1469 dump = vzalloc(sizeof(*dump));
1491 if (!dump) { 1470 if (!dump) {
1492 ret = -ENOMEM; 1471 ret = -ENOMEM;
1493 goto out_err; 1472 goto out_err;
1494 } 1473 }
1495 1474
1496 /* Keep size of the buffer page align 1475 /* Keep size of the buffer page aligned so that it can be mmaped */
1497 data_size = roundup(sizeof(struct vmc 1476 data_size = roundup(sizeof(struct vmcoredd_header) + data->size,
1498 PAGE_SIZE); 1477 PAGE_SIZE);
1499 1478
1500 /* Allocate buffer for driver's to wr 1479 /* Allocate buffer for driver's to write their dumps */
1501 buf = vmcore_alloc_buf(data_size); 1480 buf = vmcore_alloc_buf(data_size);
1502 if (!buf) { 1481 if (!buf) {
1503 ret = -ENOMEM; 1482 ret = -ENOMEM;
1504 goto out_err; 1483 goto out_err;
1505 } 1484 }
1506 1485
1507 vmcoredd_write_header(buf, data, data 1486 vmcoredd_write_header(buf, data, data_size -
1508 sizeof(struct v 1487 sizeof(struct vmcoredd_header));
1509 1488
1510 /* Invoke the driver's dump collectio 1489 /* Invoke the driver's dump collection routing */
1511 ret = data->vmcoredd_callback(data, b 1490 ret = data->vmcoredd_callback(data, buf +
1512 sizeof( 1491 sizeof(struct vmcoredd_header));
1513 if (ret) 1492 if (ret)
1514 goto out_err; 1493 goto out_err;
1515 1494
1516 dump->buf = buf; 1495 dump->buf = buf;
1517 dump->size = data_size; 1496 dump->size = data_size;
1518 1497
1519 /* Add the dump to driver sysfs list 1498 /* Add the dump to driver sysfs list */
1520 mutex_lock(&vmcoredd_mutex); 1499 mutex_lock(&vmcoredd_mutex);
1521 list_add_tail(&dump->list, &vmcoredd_ 1500 list_add_tail(&dump->list, &vmcoredd_list);
1522 mutex_unlock(&vmcoredd_mutex); 1501 mutex_unlock(&vmcoredd_mutex);
1523 1502
1524 vmcoredd_update_size(data_size); 1503 vmcoredd_update_size(data_size);
1525 return 0; 1504 return 0;
1526 1505
1527 out_err: 1506 out_err:
1528 vfree(buf); !! 1507 if (buf)
1529 vfree(dump); !! 1508 vfree(buf);
>> 1509
>> 1510 if (dump)
>> 1511 vfree(dump);
1530 1512
1531 return ret; 1513 return ret;
1532 } 1514 }
1533 EXPORT_SYMBOL(vmcore_add_device_dump); 1515 EXPORT_SYMBOL(vmcore_add_device_dump);
1534 #endif /* CONFIG_PROC_VMCORE_DEVICE_DUMP */ 1516 #endif /* CONFIG_PROC_VMCORE_DEVICE_DUMP */
1535 1517
1536 /* Free all dumps in vmcore device dump list 1518 /* Free all dumps in vmcore device dump list */
1537 static void vmcore_free_device_dumps(void) 1519 static void vmcore_free_device_dumps(void)
1538 { 1520 {
1539 #ifdef CONFIG_PROC_VMCORE_DEVICE_DUMP 1521 #ifdef CONFIG_PROC_VMCORE_DEVICE_DUMP
1540 mutex_lock(&vmcoredd_mutex); 1522 mutex_lock(&vmcoredd_mutex);
1541 while (!list_empty(&vmcoredd_list)) { 1523 while (!list_empty(&vmcoredd_list)) {
1542 struct vmcoredd_node *dump; 1524 struct vmcoredd_node *dump;
1543 1525
1544 dump = list_first_entry(&vmco 1526 dump = list_first_entry(&vmcoredd_list, struct vmcoredd_node,
1545 list) 1527 list);
1546 list_del(&dump->list); 1528 list_del(&dump->list);
1547 vfree(dump->buf); 1529 vfree(dump->buf);
1548 vfree(dump); 1530 vfree(dump);
1549 } 1531 }
1550 mutex_unlock(&vmcoredd_mutex); 1532 mutex_unlock(&vmcoredd_mutex);
1551 #endif /* CONFIG_PROC_VMCORE_DEVICE_DUMP */ 1533 #endif /* CONFIG_PROC_VMCORE_DEVICE_DUMP */
1552 } 1534 }
1553 1535
1554 /* Init function for vmcore module. */ 1536 /* Init function for vmcore module. */
1555 static int __init vmcore_init(void) 1537 static int __init vmcore_init(void)
1556 { 1538 {
1557 int rc = 0; 1539 int rc = 0;
1558 1540
1559 /* Allow architectures to allocate EL 1541 /* Allow architectures to allocate ELF header in 2nd kernel */
1560 rc = elfcorehdr_alloc(&elfcorehdr_add 1542 rc = elfcorehdr_alloc(&elfcorehdr_addr, &elfcorehdr_size);
1561 if (rc) 1543 if (rc)
1562 return rc; 1544 return rc;
1563 /* 1545 /*
1564 * If elfcorehdr= has been passed in 1546 * If elfcorehdr= has been passed in cmdline or created in 2nd kernel,
1565 * then capture the dump. 1547 * then capture the dump.
1566 */ 1548 */
1567 if (!(is_vmcore_usable())) 1549 if (!(is_vmcore_usable()))
1568 return rc; 1550 return rc;
1569 rc = parse_crash_elf_headers(); 1551 rc = parse_crash_elf_headers();
1570 if (rc) { 1552 if (rc) {
1571 elfcorehdr_free(elfcorehdr_ad <<
1572 pr_warn("Kdump: vmcore not in 1553 pr_warn("Kdump: vmcore not initialized\n");
1573 return rc; 1554 return rc;
1574 } 1555 }
1575 elfcorehdr_free(elfcorehdr_addr); 1556 elfcorehdr_free(elfcorehdr_addr);
1576 elfcorehdr_addr = ELFCORE_ADDR_ERR; 1557 elfcorehdr_addr = ELFCORE_ADDR_ERR;
1577 1558
1578 proc_vmcore = proc_create("vmcore", S 1559 proc_vmcore = proc_create("vmcore", S_IRUSR, NULL, &vmcore_proc_ops);
1579 if (proc_vmcore) 1560 if (proc_vmcore)
1580 proc_vmcore->size = vmcore_si 1561 proc_vmcore->size = vmcore_size;
1581 return 0; 1562 return 0;
1582 } 1563 }
1583 fs_initcall(vmcore_init); 1564 fs_initcall(vmcore_init);
1584 1565
1585 /* Cleanup function for vmcore module. */ 1566 /* Cleanup function for vmcore module. */
1586 void vmcore_cleanup(void) 1567 void vmcore_cleanup(void)
1587 { 1568 {
1588 if (proc_vmcore) { 1569 if (proc_vmcore) {
1589 proc_remove(proc_vmcore); 1570 proc_remove(proc_vmcore);
1590 proc_vmcore = NULL; 1571 proc_vmcore = NULL;
1591 } 1572 }
1592 1573
1593 /* clear the vmcore list. */ 1574 /* clear the vmcore list. */
1594 while (!list_empty(&vmcore_list)) { 1575 while (!list_empty(&vmcore_list)) {
1595 struct vmcore *m; 1576 struct vmcore *m;
1596 1577
1597 m = list_first_entry(&vmcore_ 1578 m = list_first_entry(&vmcore_list, struct vmcore, list);
1598 list_del(&m->list); 1579 list_del(&m->list);
1599 kfree(m); 1580 kfree(m);
1600 } 1581 }
1601 free_elfcorebuf(); 1582 free_elfcorebuf();
1602 1583
1603 /* clear vmcore device dump list */ 1584 /* clear vmcore device dump list */
1604 vmcore_free_device_dumps(); 1585 vmcore_free_device_dumps();
1605 } 1586 }
1606 1587
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.