From patchwork Wed Jan 6 07:49:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 12001083 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 72F8DC433E0 for ; Wed, 6 Jan 2021 07:50:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3209423106 for ; Wed, 6 Jan 2021 07:50:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725971AbhAFHuD (ORCPT ); Wed, 6 Jan 2021 02:50:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50966 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726011AbhAFHuD (ORCPT ); Wed, 6 Jan 2021 02:50:03 -0500 Received: from xavier.telenet-ops.be (xavier.telenet-ops.be [IPv6:2a02:1800:120:4::f00:14]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CBDF9C061359 for ; Tue, 5 Jan 2021 23:49:22 -0800 (PST) Received: from ramsan.of.borg ([84.195.186.194]) by xavier.telenet-ops.be with bizsmtp id DKpL2401D4C55Sk01KpLW7; Wed, 06 Jan 2021 08:49:20 +0100 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1kx3ZI-001Vb6-0o; Wed, 06 Jan 2021 08:49:20 +0100 Received: from geert by rox.of.borg with local (Exim 4.93) (envelope-from ) id 1kx3ZH-006gMf-HS; Wed, 06 Jan 2021 08:49:19 +0100 From: Geert Uytterhoeven To: Alexander Viro 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 Message-Id: <20210106074919.1592772-1-geert@linux-m68k.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org 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 --- 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 */