From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] binfmt_elf: Fix fill_prstatus() call in fill_note_info()
Date: Wed, 6 Jan 2021 08:49:17 +0100 [thread overview]
Message-ID: <20210106074919.1592772-1-geert@linux-m68k.org> (raw)
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: noreply@ellerman.id.au
Fixes: 147d88b334cd5416 ("elf_prstatus: collect the common part (everything before pr_reg) into a struct")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
Compile-tested only. Feel free to fold into the original commit.
---
fs/binfmt_elf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 1b678aff3bac93eb..4c1550b13899efd7 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -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 */
--
2.25.1
reply other threads:[~2021-01-06 7:50 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210106074919.1592772-1-geert@linux-m68k.org \
--to=geert@linux-m68k.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).