Skip to contentSkip to conversation

binfmt_elf: Fix fill_prstatus() call in fill_note_info()

PATCH Superseded Geert Uytterhoeven 1 participant 1 message Jan 6, 2021

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 binfmt_elf: Fix fill_prstatus() call in fill_note_info()

On m68k, which does not define CORE_DUMP_USE_REGSET:

fs/binfmt_elf.c: In function ‘fill_note_info’:
fs/binfmt_elf.c:2040:20: error: passing argument 1 of ‘fill_prstatus’ from incompatible pointer type [-Werror=incompatible-pointer-types]
2040 | fill_prstatus(info->prstatus, current, siginfo->si_signo);
| ~~~~^~~~~~~~~~
| |
| struct elf_prstatus *
fs/binfmt_elf.c:1498:55: note: expected ‘struct elf_prstatus_common *’ but argument is of type ‘struct elf_prstatus *’
1498 | static void fill_prstatus(struct elf_prstatus_common *prstatus,
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~

The fill_prstatus() signature was changed, but one caller was not updated.

Reported-by [email protected]
Fixes 147d88b334cd5416 ("elf_prstatus: collect the common part (everything before pr_reg) into a struct")

---
Compile-tested only. Feel free to fold into the original commit.

---
 fs/binfmt_elf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/binfmt_elf.c +1 -1
index 1b678aff3bac93eb..4c1550b13899efd7 100644
@@ -2037,7 +2037,7 @@ static int fill_note_info(struct elfhdr *elf, int phdrs,
 	}
 	/* now collect the dump for the current */
 	memset(info->prstatus, 0, sizeof(*info->prstatus));
-	fill_prstatus(info->prstatus, current, siginfo->si_signo);
+	fill_prstatus(&info->prstatus->common, current, siginfo->si_signo);
 	elf_core_copy_regs(&info->prstatus->pr_reg, regs);
 
 	/* Set up header */
Signature · 1 line
2.25.1