From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B64DE82CA7 for ; Wed, 27 Sep 2023 15:59:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 046F78D006E; Wed, 27 Sep 2023 11:59:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F3A168D0030; Wed, 27 Sep 2023 11:59:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E016B8D006E; Wed, 27 Sep 2023 11:59:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id CC06E8D0030 for ; Wed, 27 Sep 2023 11:59:09 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 76005A0AB2 for ; Wed, 27 Sep 2023 15:59:09 +0000 (UTC) X-FDA: 81282836418.01.6451BC7 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by imf04.hostedemail.com (Postfix) with ESMTP id 9A8334001A for ; Wed, 27 Sep 2023 15:59:07 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=TZrB1tzL; spf=pass (imf04.hostedemail.com: domain of keescook@chromium.org designates 209.85.210.171 as permitted sender) smtp.mailfrom=keescook@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695830347; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=utRl+TWc9PyHN267mk74epV1Ewzm2gClJk4DlVuRtdw=; b=eOR+rDNFJRx6JjhDLeKiO0fGVP5Uqd5S+7ge6v1LI9j1KDr2b5YkDE2M496jrt8FOSfX7v 5rNtIlLpEyDBWB+JLEgzTkl53nPZrucnEzSmb6LBQ95dlQejo3S7/lS3lw/3PRVMnlroJ+ fxhZAOGLqt7xflu1MDjJIV0YN6qeZcg= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=TZrB1tzL; spf=pass (imf04.hostedemail.com: domain of keescook@chromium.org designates 209.85.210.171 as permitted sender) smtp.mailfrom=keescook@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695830347; a=rsa-sha256; cv=none; b=X1ZP3dFj8IudbkpYNtyUL29J8vn9sMiZLhjQbXwRlAQ0bluQaM2XSxMEaZjMM7N9jAjhkq gURLR9ilRrRUSfY/RHEB4bWVQeuckaf+MtTPepff+CrOLjP849VoaO0UKacUutfO1hCHFu ua1gJ8gNrfKbMx414me+qFG5Aw/y7Is= Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-690bd59322dso8798562b3a.3 for ; Wed, 27 Sep 2023 08:59:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1695830346; x=1696435146; darn=kvack.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=utRl+TWc9PyHN267mk74epV1Ewzm2gClJk4DlVuRtdw=; b=TZrB1tzLYkt1DFzGeio/SaY8vJQMABNY6cXrbd4VBPp5dEZk+RaMzXUwdGKC1K6bgu GTtBUBE7w9wnJIBUZpGm78euwOSCSkAU/U+eYgnnFSyU2sKM1BC2q2jYTnFm543jA9oE BO66HfG4susp20YkgPLHxccmzNcLBns2Th9ak= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695830346; x=1696435146; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=utRl+TWc9PyHN267mk74epV1Ewzm2gClJk4DlVuRtdw=; b=Arms3CWXC8IIquDHL4yUq7iLmgxDfE4GzQs3fS1kbjPXY69yUxMkj8fmo2EJ4u6yUT A86aWBeRuOuGFyaMByUmQrG17WmW3yc2z7k+ugBObh6V/9FdLqyZPy7us3ttqK6QnoBg O14xTdC+OERpSQH1IRnj/ArE+yR60HsFBtRkBOv1gJJ13Ig2kxOpjHuHKDqMPL/2Ut3x dFqQ41scgZQ+JUalcUKc8XhM05bL9ikiaQ9W6mAF12ZtWkT8MnQY6dJ/sGxED++hpKLq MLHP1v68Hn7HU2a4Ajkuyz3j/qLxAc2ep+AqxM+BfCJxamMjpz8qZf7lE555AVW0j3VJ EYdw== X-Gm-Message-State: AOJu0YyploIZKqwZeh1D4ucZg28eDYNnJR70DaLTpJ+TcsqbsDj4hPqX 4Jq1rXLDN+n9sfZcJrIFVloVi/FxVIhYuNz7oAs= X-Google-Smtp-Source: AGHT+IGQQKE15BkC2Mvcl+UNkghrr3fsPU7wV1jTnHmm9/hYjYgN74+YUAsP+ZwmLl06l6zxGgj81Q== X-Received: by 2002:a05:6a00:21cf:b0:68a:69ba:6791 with SMTP id t15-20020a056a0021cf00b0068a69ba6791mr2592928pfj.8.1695830346245; Wed, 27 Sep 2023 08:59:06 -0700 (PDT) Received: from www.outflux.net (198-0-35-241-static.hfc.comcastbusiness.net. [198.0.35.241]) by smtp.gmail.com with ESMTPSA id x2-20020aa784c2000000b006884844dfcdsm11987898pfn.55.2023.09.27.08.59.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 08:59:05 -0700 (PDT) Date: Wed, 27 Sep 2023 08:59:05 -0700 From: Kees Cook To: Greg Ungerer Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, palmer@rivosinc.com, ebiederm@xmission.com, brauner@kernel.org, viro@zeniv.linux.org.uk Subject: Re: [PATCH] binfmt_elf_fdpic: clean up debug warnings Message-ID: <202309270858.680FCD9A85@keescook> References: <20230927132933.3290734-1-gerg@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20230927132933.3290734-1-gerg@kernel.org> X-Rspamd-Queue-Id: 9A8334001A X-Rspam-User: X-Stat-Signature: br4i1xf43ehxahwemcxjo7cu4od1ouzc X-Rspamd-Server: rspam01 X-HE-Tag: 1695830347-780427 X-HE-Meta: U2FsdGVkX1/jDwB3p620EVEINiCzzZmF8VEJY/jL0Kt/UqKzM4U8o8H1/5rTfLeyN1aMQgh4mMLp7/4CAQNOZKtY746+7C1/b1s6MFh4ZdWGbQJtnbypiS+mxL152FyRzpRnpp7IUvz4gyIXSBezdzibH2QYhQSkAnalvY0kh9LpONP79t7agM0/W8rfzC9ZZnT9LO4uBJ29OIFKCC+c6S3kAguMI7SK7vs1TprRC/2rtWHVM1S3xEI084RRAy/HFqkXS1cI1XE209FK11U5FSWfDPGciunnIL03v6ip8JSuv3Ku+lnuFipAzGMiMCflOJhJYWhd/GnJUkKlQ4XTYTsAFoSNN6ZpCiCHv7+4PrKovpR0jCUk0i8gAoIMLbBbl7kRWlD2XLvh0mdKnW/HpuvGGcWrGiO/iLd35XCYuMnkmkKzTwbSMC3wYa5YV9ysEAFwG4QRfAO6C0b+J2eTUmolQU29Ch43qkd8Tj8Pz5I3/pvWGu5kYxmGXhXfW+gnR0Fx4g4n4FtxZCQGEfvvXiveDaDgdidjfTk7UaegfEW1MtJIm/0xaD7u7zSYUuPsT/onLpIYuhWvEgKUgQh0G8QoPnJsJrR4tCt3WZ6wC41Lq3o0fLYKJu7eURi+vhj9mwkLx1Kf/ouBF1YGkhI3YrMsfreSTMnaeQVFvR0fM7cSMwSTzV9TVqEAgU5x5JrC2tdbapRzgdTSu263iNmfSR7qNf5TCdm3ByO/uLYnUawcmY9vCeg2ZLiM8LyMvad5s+DNA0W3MVYe8BfL2e3/Gsr05FF50aW+6xBe5aPUh4Lf52JqHLvP1iKQo2Vhu+TFCyP2Kk9H0x4tdtUaWWjMLSPWeRzjZxGsSS9jfRUzL6uJhUyrAD0QVu1EwleoXE3RT1x3MW38qqFxiJ/O3tcc3xovF3r2VOd1mji3Mes2lvTXRutx4pSWSSjO1OVexKhmD7UrEE9ByjGBnXaLJTc hZhNd7w9 kypkW20nqZqoV6PelTp8HlI/fSlb6AkwyMHZnXJaqgJEh/Hh4l5cTBrKdJL+sU+4SeeNK3VjHzvnwmPtxhdkOmr/O7Lqv4BDtt1rM+T6lY4JUEgCZf8405/UUgm4bq684nThPqglo/Zm8nY2IAV2PkL8rWHCX7Bm1dTAfO2CtxN0egmOHC6Vv9GY0qGpXsGyXGisazBu2Wgw3DcjHfosZCr21m9G+ZG4F6NTU1REJ9peo2OQWAONyLFQCjUOSEYaNNXLVeSg44q5qR2g2qaf0y4Cm7RYn/hUnhxVVEg9qbb4b8HjQPiG1sbM9QfQ2kcSQ2nulAnRV3fPlwpI9cVaRyhxeLjU72pYbmDFtK7JwEKYnZ53IOVN11GmGAUqzBFKM1AIh4dVSwZEK9bkhv26y/1zkTDHWyet2vsYUFG4T8Cu1gMQ08iL6n2DJtb+pJMJIlfzPFP4hwXQAg7Y= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Wed, Sep 27, 2023 at 11:29:33PM +1000, Greg Ungerer wrote: > 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 ‘elf_fdpic_map_file’: > fs/binfmt_elf_fdpic.c:46:33: warning: format ‘%x’ expects argument of type ‘unsigned int’, but argument 3 has type ‘Elf64_Addr’ {aka ‘long long unsigned int’} [-Wformat=] > 46 | #define kdebug(fmt, ...) printk("FDPIC "fmt"\n" ,##__VA_ARGS__ ) > | ^~~~~~~~ > ./include/linux/printk.h:427:25: note: in definition of macro ‘printk_index_wrap’ > 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. It seems like these should all just be "unsigned long", yes? -Kees > > 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 = loadmap->segs; > for (loop = 0; loop < loadmap->nsegs; loop++, seg++) > - kdebug("- LOAD[%d] : %08x-%08x [va=%x ms=%x]", > + kdebug("- LOAD[%d] : %08llx-%08llx [va=%llx ms=%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); > > return 0; > > @@ -1082,9 +1084,10 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params, > maddr = vm_mmap(file, maddr, phdr->p_memsz + disp, prot, flags, > phdr->p_offset - disp); > > - kdebug("mmap[%d] sz=%lx pr=%x fl=%x of=%lx --> %08lx", > - loop, phdr->p_memsz + disp, prot, flags, > - phdr->p_offset - disp, maddr); > + kdebug("mmap[%d] sz=%llx pr=%x fl=%x of=%llx --> %08lx", > + loop, (unsigned long long) phdr->p_memsz + disp, > + prot, flags, (unsigned long long) phdr->p_offset - disp, > + maddr); > > if (IS_ERR_VALUE(maddr)) > return (int) maddr; > @@ -1146,8 +1149,9 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params, > > #else > if (excess > 0) { > - kdebug("clear[%d] ad=%lx sz=%lx", > - loop, maddr + phdr->p_filesz, excess); > + kdebug("clear[%d] ad=%llx sz=%lx", loop, > + (unsigned long long) maddr + phdr->p_filesz, > + excess); > if (clear_user((void *) maddr + phdr->p_filesz, excess)) > return -EFAULT; > } > -- > 2.25.1 > -- Kees Cook