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 E6E3EC282DE for ; Sat, 8 Mar 2025 02:22:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B021A6B0083; Fri, 7 Mar 2025 21:22:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id AB00E6B0085; Fri, 7 Mar 2025 21:22:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9A0A86B0088; Fri, 7 Mar 2025 21:22:38 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 7B1226B0083 for ; Fri, 7 Mar 2025 21:22:38 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id A6B79C12E2 for ; Sat, 8 Mar 2025 02:22:38 +0000 (UTC) X-FDA: 83196785196.13.7EAA924 Received: from out-170.mta1.migadu.com (out-170.mta1.migadu.com [95.215.58.170]) by imf27.hostedemail.com (Postfix) with ESMTP id BB76540008 for ; Sat, 8 Mar 2025 02:22:36 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=WyslvGXS; spf=pass (imf27.hostedemail.com: domain of sunliming@linux.dev designates 95.215.58.170 as permitted sender) smtp.mailfrom=sunliming@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741400557; 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=jjhDoAzUW/5FGOnDp5v3OzlWQhpu3YvcufnBv3JkkCM=; b=gPnDY0QU2FJIk5JiwR0rqSx1o1eD7q+O/VqaE7ftKV3P/ztONTlYqXHsGa1g/3Op+WGFbZ c3Pf1WUhGEM/mcAzPSeYjOWQ47JZHJX1VoNnc8IJPVyMaz25PPxtMQcNYyE8nbSMV0ip6j KCUkU8CjyLWsoFJWlAD13eAJQDuiuqk= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=WyslvGXS; spf=pass (imf27.hostedemail.com: domain of sunliming@linux.dev designates 95.215.58.170 as permitted sender) smtp.mailfrom=sunliming@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741400557; a=rsa-sha256; cv=none; b=bTv3huCi+NmK2SIaOY3+gwFn4TsNckvMXi5Mm3VG9kV9AIQA2ClxIGu8BbJaE+smijgRRM TTVi5gqhRM0rvtXtmtLucZtIN/PFTUCMAJvtEEF/3dH/erPKPjBk5mb9j4fj8dejVASwZ0 ONoEWw8XV3B7PqMj8unsu6THhyJ6lDk= Message-ID: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1741400555; h=from:from: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; bh=jjhDoAzUW/5FGOnDp5v3OzlWQhpu3YvcufnBv3JkkCM=; b=WyslvGXSkVSfE45H250Oc8xhGdfep6CJ03v8xSTm1NlBuuoYFOJekXiQapFNHzVBr0sFgf aPVdC/D1z9yTXMwG76VmJNwp7EOEunCUVEeachPWaLqL6QiP4oU1vXiRusZzj9OS5F2cdi rBVZHezXAvweCUq6RmimulD3iMtv+Gw= Date: Sat, 8 Mar 2025 10:21:37 +0800 MIME-Version: 1.0 Subject: Re: [PATCH] fs: binfmt_elf_efpic: fix variable set but not used warning Content-Language: en-US To: Kees Cook , Jan Kara Cc: viro@zeniv.linux.org.uk, brauner@kernel.org, ebiederm@xmission.com, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, sunliming@kylinos.cn, kernel test robot References: <20250307061128.2999222-1-sunliming@linux.dev> <202503071227.578545FF9@keescook> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Sunliming In-Reply-To: <202503071227.578545FF9@keescook> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Stat-Signature: 1krtsze4h1qphk9bpfzyfdugo7r1aazn X-Rspam-User: X-Rspamd-Queue-Id: BB76540008 X-Rspamd-Server: rspam01 X-HE-Tag: 1741400556-222275 X-HE-Meta: U2FsdGVkX18j+K3eml2ItbPziht+jc3LlHBiHyqhP4AQ8i4j4FagZOGcEwpk0kd8A5eV2Ps3vOuSg2KHywY3yojY/UkZAsF3mEhJYvnT9rWePBpJgE4Nuuwi2n3VP2cN7EtFZ5bT9vUJ+J5KihaoCkv3uaV5lOatgl18cWaF+SNfrtSZLsCgROvLk/QVB+I7J2TdUFB+ZIGZGLMqgW14SSIKGhSqSeFbKVu1jeJgqW8Va9m8V1Qfr2xmTsfDXADVLBoPJwUjKyemUVyyFUDf50v1SzQzM3emEeCqha9qdnV4E7Ga87o9D4KzPwAlqy35m2pmracr3ObZ6gipsv8W9E+V6ZozVy8bA1rzwFT7QRIxTDwvlQvv4buHdNk8sM5SRPAoTwD+3IwwjTlRirWR0XRSu2eA+5/0Dc8Kmi5nzbBEcVY6PPbrP8OTqvcdEKS2tZnJYFkjnjRkTJD1EHO+DnMEIrEwOZ8OG/uIhk/coxwWpiu5K4bLf1wDY1hG841ETA4ZFl8rvdwEtRMJ+0ck1L51IKUv0wt7HyMkKIoy6IomOB8/n3l8R9H53CQp/bXMNDLM1897pHVGSOjk3vNVG6HupvXk2I+FRJz7zvNb5KPyWkjp+aXmOFJBeQdFsVplW7DCfBWI8retArWMhEtvwM+5GDWEeYJSPyoIWmH5ANMx/nu5nLl7l8yWfTrYAZvlMtdsBlVc/KhdenBwU7Exy96UPzaNsRAmAUo8Cq6j8Sc2nO8kOugFEG6eB1IvGxO8AqocVQdyK6P8gFKYjUJv7wDCXxkrGGq9Raxz4xtlHOW5WVe1AVnF0kCdXsJaC6cpRI7tCSpcxm42iqaWonPJ3q7fShI6PAbuAhT1YVrLanPWwu8uN2HCP9J3pRbcNQOyt4RE3DPL9aiiAVvkWemkKDB4QA29uz+o1croJfRhrHiN5TzXEDbpWNdGuY9MqjmP6gWSjVlpVEoCq2grDjE fO1smAuq 2JTSlYiPz2QiFgzUjHxBZGJa2JQzosJzgj39DUBnFBV9/f6fWmS7wdu9YRGUGS27C5oxu1BYTlntu/WPLTF8E0dxZuxs9gbGsf8DKF86RoU6VSbnBKACGDbkWF31ajxW/IkcvDioShSnqOtMTk7VhaFLtUCD/2Au2PtgenQ+eKP0jYlJRI4IllURIXlG4BxcwzUWEnAzWG7gUlhntn2qMnqGbrY7sEZPbMrmz3pN/EogBNst59XahzGA9jP/oyraWeDOVdoAZx4rTXQRK5jitZDT60NwVjG6CBqKHFLnkohr4ozy0NHAGXKQTbmA7vX6gou/LV6768SBQK5p1ZDsmQ8gq+Q== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On 2025/3/8 04:30, Kees Cook wrote: > On Fri, Mar 07, 2025 at 03:47:28PM +0100, Jan Kara wrote: >> On Fri 07-03-25 14:11:28, sunliming@linux.dev wrote: >>> From: sunliming >>> >>> Fix below kernel warning: >>> fs/binfmt_elf_fdpic.c:1024:52: warning: variable 'excess1' set but not >>> used [-Wunused-but-set-variable] >>> >>> Reported-by: kernel test robot >>> Signed-off-by: sunliming >> The extra ifdef is not pretty but I guess it's better. Feel free to add: >> >> Reviewed-by: Jan Kara > Since we allow loop-scope variable definitions now, perhaps this is a > case for defining the variable later within the #ifdef, like this? > > > diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c > index e3cf2801cd64..b0ef71238328 100644 > --- a/fs/binfmt_elf_fdpic.c > +++ b/fs/binfmt_elf_fdpic.c > @@ -1024,7 +1024,7 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params, > /* deal with each load segment separately */ > phdr = params->phdrs; > for (loop = 0; loop < params->hdr.e_phnum; loop++, phdr++) { > - unsigned long maddr, disp, excess, excess1; > + unsigned long maddr, disp, excess; > int prot = 0, flags; > > if (phdr->p_type != PT_LOAD) > @@ -1120,9 +1120,10 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params, > * extant in the file > */ > excess = phdr->p_memsz - phdr->p_filesz; > - excess1 = PAGE_SIZE - ((maddr + phdr->p_filesz) & ~PAGE_MASK); > > #ifdef CONFIG_MMU > + const unsigned long excess1 = > + PAGE_SIZE - ((maddr + phdr->p_filesz) & ~PAGE_MASK); > if (excess > excess1) { > unsigned long xaddr = maddr + phdr->p_filesz + excess1; > unsigned long xmaddr; I think this is a good idea. I will resend this patch in this way，thanks. >> Honza >> >>> --- >>> fs/binfmt_elf_fdpic.c | 7 +++++-- >>> 1 file changed, 5 insertions(+), 2 deletions(-) >>> >>> diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c >>> index e3cf2801cd64..bed13ee8bfec 100644 >>> --- a/fs/binfmt_elf_fdpic.c >>> +++ b/fs/binfmt_elf_fdpic.c >>> @@ -1024,8 +1024,11 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params, >>> /* deal with each load segment separately */ >>> phdr = params->phdrs; >>> for (loop = 0; loop < params->hdr.e_phnum; loop++, phdr++) { >>> - unsigned long maddr, disp, excess, excess1; >>> + unsigned long maddr, disp, excess; >>> int prot = 0, flags; >>> +#ifdef CONFIG_MMU >>> + unsigned long excess1; >>> +#endif >>> >>> if (phdr->p_type != PT_LOAD) >>> continue; >>> @@ -1120,9 +1123,9 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params, >>> * extant in the file >>> */ >>> excess = phdr->p_memsz - phdr->p_filesz; >>> - excess1 = PAGE_SIZE - ((maddr + phdr->p_filesz) & ~PAGE_MASK); >>> >>> #ifdef CONFIG_MMU >>> + excess1 = PAGE_SIZE - ((maddr + phdr->p_filesz) & ~PAGE_MASK); >>> if (excess > excess1) { >>> unsigned long xaddr = maddr + phdr->p_filesz + excess1; >>> unsigned long xmaddr; >>> -- >>> 2.25.1 >>> >> -- >> Jan Kara >> SUSE Labs, CR