From nobody Fri Feb 13 07:52:10 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9C38E7F14E for ; Wed, 27 Sep 2023 13:29:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231934AbjI0N3w (ORCPT ); Wed, 27 Sep 2023 09:29:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230037AbjI0N3u (ORCPT ); Wed, 27 Sep 2023 09:29:50 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84B26121; Wed, 27 Sep 2023 06:29:49 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0DE94C433C7; Wed, 27 Sep 2023 13:29:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695821389; bh=HP0v40iSx8Vr8h/BjmerjsuwLjXNU/N7N3nzZW+WetY=; h=From:To:Cc:Subject:Date:From; b=efQ5Qou8ufF+JGMgMJavR2QSr4mopBd2oEsorbMTk3whH2K6Q3uv/3pXPVQFTn/ob qR+YiThAyNRbuwS98TNG/xzxml1jOpxBOsVFGhhX7rtenixlPJKcZsRNOjbmnShWMs m6O1/IvK7TIu2bSF3WnUkhCyojXYmQt2ASPlXRfsfVkpzDh7cZy/AIK7Xbp6DYEAuS SNGC+Ilnzo3x5xTNYmEcMWz4nzygVpDFmVX1ednK673veM50QScCU6FsVYmT592ORQ gyGibnwc6goWufL/kBuGGuawKWmj+/QCDQqba8m8F+3PHB1MG4lRSCcFQ87ecFRWN5 Q1L8QYAcMmFBg== From: Greg Ungerer To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: palmer@rivosinc.com, keescook@chromium.org, ebiederm@xmission.com, brauner@kernel.org, viro@zeniv.linux.org.uk, Greg Ungerer Subject: [PATCH] binfmt_elf_fdpic: clean up debug warnings Date: Wed, 27 Sep 2023 23:29:33 +1000 Message-Id: <20230927132933.3290734-1-gerg@kernel.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The binfmt_elf_fdpic loader has some debug trace that can be enabled at build time. The recent 64-bit additions cause some warnings if that debug is enabled, such as: fs/binfmt_elf_fdpic.c: In function =E2=80=98elf_fdpic_map_file=E2=80=99: fs/binfmt_elf_fdpic.c:46:33: warning: format =E2=80=98%x=E2=80=99 expec= ts argument of type =E2=80=98unsigned int=E2=80=99, but argument 3 has type= =E2=80=98Elf64_Addr=E2=80=99 {aka =E2=80=98long long unsigned int=E2=80=99= } [-Wformat=3D] 46 | #define kdebug(fmt, ...) printk("FDPIC "fmt"\n" ,##__VA_ARGS__ ) | ^~~~~~~~ ./include/linux/printk.h:427:25: note: in definition of macro =E2=80=98= printk_index_wrap=E2=80=99 427 | _p_func(_fmt, ##__VA_ARGS__); = \ | ^~~~ Cast values to the largest possible type (which is equivilent to unsigned long long in this case) and use appropriate format specifiers to match. Fixes: b922bf04d2c1 ("binfmt_elf_fdpic: support 64-bit systems") Signed-off-by: Greg Ungerer --- fs/binfmt_elf_fdpic.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c index 43b2a2851ba3..97c3e8551aac 100644 --- a/fs/binfmt_elf_fdpic.c +++ b/fs/binfmt_elf_fdpic.c @@ -900,10 +900,12 @@ static int elf_fdpic_map_file(struct elf_fdpic_params= *params, kdebug("- DYNAMIC[]: %lx", params->dynamic_addr); seg =3D loadmap->segs; for (loop =3D 0; loop < loadmap->nsegs; loop++, seg++) - kdebug("- LOAD[%d] : %08x-%08x [va=3D%x ms=3D%x]", + kdebug("- LOAD[%d] : %08llx-%08llx [va=3D%llx ms=3D%llx]", loop, - seg->addr, seg->addr + seg->p_memsz - 1, - seg->p_vaddr, seg->p_memsz); + (unsigned long long) seg->addr, + (unsigned long long) seg->addr + seg->p_memsz - 1, + (unsigned long long) seg->p_vaddr, + (unsigned long long) seg->p_memsz); =20 return 0; =20 @@ -1082,9 +1084,10 @@ static int elf_fdpic_map_file_by_direct_mmap(struct = elf_fdpic_params *params, maddr =3D vm_mmap(file, maddr, phdr->p_memsz + disp, prot, flags, phdr->p_offset - disp); =20 - kdebug("mmap[%d] sz=3D%lx pr=3D%x fl=3D%x of=3D%lx --> %08lx", - loop, phdr->p_memsz + disp, prot, flags, - phdr->p_offset - disp, maddr); + kdebug("mmap[%d] sz=3D%llx pr=3D%x fl=3D%x of=3D%llx --> %08lx", + loop, (unsigned long long) phdr->p_memsz + disp, + prot, flags, (unsigned long long) phdr->p_offset - disp, + maddr); =20 if (IS_ERR_VALUE(maddr)) return (int) maddr; @@ -1146,8 +1149,9 @@ static int elf_fdpic_map_file_by_direct_mmap(struct e= lf_fdpic_params *params, =20 #else if (excess > 0) { - kdebug("clear[%d] ad=3D%lx sz=3D%lx", - loop, maddr + phdr->p_filesz, excess); + kdebug("clear[%d] ad=3D%llx sz=3D%lx", loop, + (unsigned long long) maddr + phdr->p_filesz, + excess); if (clear_user((void *) maddr + phdr->p_filesz, excess)) return -EFAULT; } --=20 2.25.1