elfcore: Add a cprm parameter to elf_core_extra_{phdrs,data_size}

ctmarinas · willdeacon · commit 19e183b54528 · 2023-01-05T15:12:12.000Z
A subsequent fix for arm64 will use this parameter to parse the vma information from the snapshot created by dump_vma_snapshot() rather than traversing the vma list without the mmap_lock. Fixes: 6dd8b1a ("arm64: mte: Dump the MTE tags in the core file") Cc: <stable@vger.kernel.org> # 5.18.x Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Reported-by: Seth Jenkins <sethjenkins@google.com> Suggested-by: Seth Jenkins <sethjenkins@google.com> Cc: Will Deacon <will@kernel.org> Cc: Eric Biederman <ebiederm@xmission.com> Cc: Kees Cook <keescook@chromium.org> Link: https://lore.kernel.org/r/20221222181251.1345752-3-catalin.marinas@arm.com Signed-off-by: Will Deacon <will@kernel.org>
diff --git a/arch/arm64/kernel/elfcore.c b/arch/arm64/kernel/elfcore.c
@@ -76,7 +76,7 @@ static int mte_dump_tag_range(struct coredump_params *cprm,
 	return ret;
 }
 
-Elf_Half elf_core_extra_phdrs(void)
+Elf_Half elf_core_extra_phdrs(struct coredump_params *cprm)
 {
 	struct vm_area_struct *vma;
 	int vma_count = 0;
@@ -113,7 +113,7 @@ int elf_core_write_extra_phdrs(struct coredump_params *cprm, loff_t offset)
 	return 1;
 }
 
-size_t elf_core_extra_data_size(void)
+size_t elf_core_extra_data_size(struct coredump_params *cprm)
 {
 	struct vm_area_struct *vma;
 	size_t data_size = 0;
diff --git a/arch/ia64/kernel/elfcore.c b/arch/ia64/kernel/elfcore.c
@@ -7,7 +7,7 @@
 #include <asm/elf.h>
 
 
-Elf64_Half elf_core_extra_phdrs(void)
+Elf64_Half elf_core_extra_phdrs(struct coredump_params *cprm)
 {
 	return GATE_EHDR->e_phnum;
 }
@@ -60,7 +60,7 @@ int elf_core_write_extra_data(struct coredump_params *cprm)
 	return 1;
 }
 
-size_t elf_core_extra_data_size(void)
+size_t elf_core_extra_data_size(struct coredump_params *cprm)
 {
 	const struct elf_phdr *const gate_phdrs =
 		(const struct elf_phdr *) (GATE_ADDR + GATE_EHDR->e_phoff);
diff --git a/arch/x86/um/elfcore.c b/arch/x86/um/elfcore.c
@@ -7,7 +7,7 @@
 #include <asm/elf.h>
 
 
-Elf32_Half elf_core_extra_phdrs(void)
+Elf32_Half elf_core_extra_phdrs(struct coredump_params *cprm)
 {
 	return vsyscall_ehdr ? (((struct elfhdr *)vsyscall_ehdr)->e_phnum) : 0;
 }
@@ -60,7 +60,7 @@ int elf_core_write_extra_data(struct coredump_params *cprm)
 	return 1;
 }
 
-size_t elf_core_extra_data_size(void)
+size_t elf_core_extra_data_size(struct coredump_params *cprm)
 {
 	if ( vsyscall_ehdr ) {
 		const struct elfhdr *const ehdrp =
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
@@ -2034,7 +2034,7 @@ static int elf_core_dump(struct coredump_params *cprm)
 	 * The number of segs are recored into ELF header as 16bit value.
 	 * Please check DEFAULT_MAX_MAP_COUNT definition when you modify here.
 	 */
-	segs = cprm->vma_count + elf_core_extra_phdrs();
+	segs = cprm->vma_count + elf_core_extra_phdrs(cprm);
 
 	/* for notes section */
 	segs++;
@@ -2074,7 +2074,7 @@ static int elf_core_dump(struct coredump_params *cprm)
 	dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
 
 	offset += cprm->vma_data_size;
-	offset += elf_core_extra_data_size();
+	offset += elf_core_extra_data_size(cprm);
 	e_shoff = offset;
 
 	if (e_phnum == PN_XNUM) {
diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
@@ -1509,7 +1509,7 @@ static int elf_fdpic_core_dump(struct coredump_params *cprm)
 	tmp->next = thread_list;
 	thread_list = tmp;
 
-	segs = cprm->vma_count + elf_core_extra_phdrs();
+	segs = cprm->vma_count + elf_core_extra_phdrs(cprm);
 
 	/* for notes section */
 	segs++;
@@ -1555,7 +1555,7 @@ static int elf_fdpic_core_dump(struct coredump_params *cprm)
 	dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
 
 	offset += cprm->vma_data_size;
-	offset += elf_core_extra_data_size();
+	offset += elf_core_extra_data_size(cprm);
 	e_shoff = offset;
 
 	if (e_phnum == PN_XNUM) {
diff --git a/include/linux/elfcore.h b/include/linux/elfcore.h
@@ -105,14 +105,14 @@ int elf_core_copy_task_fpregs(struct task_struct *t, elf_fpregset_t *fpu);
  * Dumping its extra ELF program headers includes all the other information
  * a debugger needs to easily find how the gate DSO was being used.
  */
-extern Elf_Half elf_core_extra_phdrs(void);
+extern Elf_Half elf_core_extra_phdrs(struct coredump_params *cprm);
 extern int
 elf_core_write_extra_phdrs(struct coredump_params *cprm, loff_t offset);
 extern int
 elf_core_write_extra_data(struct coredump_params *cprm);
-extern size_t elf_core_extra_data_size(void);
+extern size_t elf_core_extra_data_size(struct coredump_params *cprm);
 #else
-static inline Elf_Half elf_core_extra_phdrs(void)
+static inline Elf_Half elf_core_extra_phdrs(struct coredump_params *cprm)
 {
 	return 0;
 }
@@ -127,7 +127,7 @@ static inline int elf_core_write_extra_data(struct coredump_params *cprm)
 	return 1;
 }
 
-static inline size_t elf_core_extra_data_size(void)
+static inline size_t elf_core_extra_data_size(struct coredump_params *cprm)
 {
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ static int mte_dump_tag_range(struct coredump_params *cprm,`
`76`	`76`	`return ret;`
`77`	`77`	`}`
`78`	`78`
`79`		`-Elf_Half elf_core_extra_phdrs(void)`
	`79`	`+Elf_Half elf_core_extra_phdrs(struct coredump_params *cprm)`
`80`	`80`	`{`
`81`	`81`	`struct vm_area_struct *vma;`
`82`	`82`	`int vma_count = 0;`
`@@ -113,7 +113,7 @@ int elf_core_write_extra_phdrs(struct coredump_params *cprm, loff_t offset)`
`113`	`113`	`return 1;`
`114`	`114`	`}`
`115`	`115`
`116`		`-size_t elf_core_extra_data_size(void)`
	`116`	`+size_t elf_core_extra_data_size(struct coredump_params *cprm)`
`117`	`117`	`{`
`118`	`118`	`struct vm_area_struct *vma;`
`119`	`119`	`size_t data_size = 0;`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#include <asm/elf.h>`
`8`	`8`
`9`	`9`
`10`		`-Elf64_Half elf_core_extra_phdrs(void)`
	`10`	`+Elf64_Half elf_core_extra_phdrs(struct coredump_params *cprm)`
`11`	`11`	`{`
`12`	`12`	`return GATE_EHDR->e_phnum;`
`13`	`13`	`}`
`@@ -60,7 +60,7 @@ int elf_core_write_extra_data(struct coredump_params *cprm)`
`60`	`60`	`return 1;`
`61`	`61`	`}`
`62`	`62`
`63`		`-size_t elf_core_extra_data_size(void)`
	`63`	`+size_t elf_core_extra_data_size(struct coredump_params *cprm)`
`64`	`64`	`{`
`65`	`65`	`const struct elf_phdr *const gate_phdrs =`
`66`	`66`	`(const struct elf_phdr *) (GATE_ADDR + GATE_EHDR->e_phoff);`
Original file line number	Diff line number	Diff line change
`@@ -105,14 +105,14 @@ int elf_core_copy_task_fpregs(struct task_struct t, elf_fpregset_t fpu);`
`105`	`105`	`* Dumping its extra ELF program headers includes all the other information`
`106`	`106`	`* a debugger needs to easily find how the gate DSO was being used.`
`107`	`107`	`*/`
`108`		`-extern Elf_Half elf_core_extra_phdrs(void);`
	`108`	`+extern Elf_Half elf_core_extra_phdrs(struct coredump_params *cprm);`
`109`	`109`	`extern int`
`110`	`110`	`elf_core_write_extra_phdrs(struct coredump_params *cprm, loff_t offset);`
`111`	`111`	`extern int`
`112`	`112`	`elf_core_write_extra_data(struct coredump_params *cprm);`
`113`		`-extern size_t elf_core_extra_data_size(void);`
	`113`	`+extern size_t elf_core_extra_data_size(struct coredump_params *cprm);`
`114`	`114`	`#else`
`115`		`-static inline Elf_Half elf_core_extra_phdrs(void)`
	`115`	`+static inline Elf_Half elf_core_extra_phdrs(struct coredump_params *cprm)`
`116`	`116`	`{`
`117`	`117`	`return 0;`
`118`	`118`	`}`
`@@ -127,7 +127,7 @@ static inline int elf_core_write_extra_data(struct coredump_params *cprm)`
`127`	`127`	`return 1;`
`128`	`128`	`}`
`129`	`129`
`130`		`-static inline size_t elf_core_extra_data_size(void)`
	`130`	`+static inline size_t elf_core_extra_data_size(struct coredump_params *cprm)`
`131`	`131`	`{`
`132`	`132`	`return 0;`
`133`	`133`	`}`