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 02291C7EE2E for ; Sun, 28 May 2023 16:34:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9EA516B0074; Sun, 28 May 2023 12:34:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 999A06B0075; Sun, 28 May 2023 12:34:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 860E76B0078; Sun, 28 May 2023 12:34:26 -0400 (EDT) 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 75D746B0074 for ; Sun, 28 May 2023 12:34:26 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 407B1801B5 for ; Sun, 28 May 2023 16:34:26 +0000 (UTC) X-FDA: 80840211732.19.0DBA787 Received: from out02.mta.xmission.com (out02.mta.xmission.com [166.70.13.232]) by imf13.hostedemail.com (Postfix) with ESMTP id 1093D20008 for ; Sun, 28 May 2023 16:34:23 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=none; spf=pass (imf13.hostedemail.com: domain of ebiederm@xmission.com designates 166.70.13.232 as permitted sender) smtp.mailfrom=ebiederm@xmission.com; dmarc=pass (policy=none) header.from=xmission.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1685291664; 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: in-reply-to:in-reply-to:references:references; bh=wA4JH1Trn5zhaxk4mMd2t/QGagYCJScc95dURUT6MKY=; b=CsiXrfFP/MpmkENcU8OOH4dGD7EkUgQzV6r/H32PFlQId2l/E67RLJWwcyICEHJK+AGXmT qeRsdn9y4gmHX7SZB7zAYBLISx+UqREJt71Ce/Z0WoV3lZTcy14neYrIAEuey3RG8eRHIP NvsROKvRI4TZenKoZ5E2ZDyZkbF4Iac= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1685291664; a=rsa-sha256; cv=none; b=wLoDUQ5kc2XZytWS+9AaZhWXTLk5tQNWs2BEJuIpm6tOKfqgnvH3oLgZ9AEzpQUGTXLUHj HdWv7CAtEGtwbS19frJzSQUoEm5uyP0FgYacmm6PXssbeihJpCFzo4DLgpcpx2zTeetAuA fLu3OcqEJddaNiPEbH3KqehK7o6da7Q= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=none; spf=pass (imf13.hostedemail.com: domain of ebiederm@xmission.com designates 166.70.13.232 as permitted sender) smtp.mailfrom=ebiederm@xmission.com; dmarc=pass (policy=none) header.from=xmission.com Received: from in01.mta.xmission.com ([166.70.13.51]:34506) by out02.mta.xmission.com with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1q3JLa-00E8Di-5G; Sun, 28 May 2023 10:34:22 -0600 Received: from ip68-110-29-46.om.om.cox.net ([68.110.29.46]:52152 helo=email.froward.int.ebiederm.org.xmission.com) by in01.mta.xmission.com with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1q3JLZ-005nnu-6C; Sun, 28 May 2023 10:34:21 -0600 From: "Eric W. Biederman" To: Christophe JAILLET Cc: Alexander Viro , Christian Brauner , Kees Cook , linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org References: <53150beae5dc04dac513dba391a2e4ae8696a7f3.1685290790.git.christophe.jaillet@wanadoo.fr> <4f5e4096ad7f17716e924b5bd080e5709fc0b84b.1685290790.git.christophe.jaillet@wanadoo.fr> Date: Sun, 28 May 2023 11:34:13 -0500 In-Reply-To: <4f5e4096ad7f17716e924b5bd080e5709fc0b84b.1685290790.git.christophe.jaillet@wanadoo.fr> (Christophe JAILLET's message of "Sun, 28 May 2023 18:20:25 +0200") Message-ID: <87sfbgjtyy.fsf@email.froward.int.ebiederm.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-XM-SPF: eid=1q3JLZ-005nnu-6C;;;mid=<87sfbgjtyy.fsf@email.froward.int.ebiederm.org>;;;hst=in01.mta.xmission.com;;;ip=68.110.29.46;;;frm=ebiederm@xmission.com;;;spf=pass X-XM-AID: U2FsdGVkX1+GhCjQTZvVqIa8i7A4q9b4QSSH7bhe+Nk= X-SA-Exim-Connect-IP: 68.110.29.46 X-SA-Exim-Mail-From: ebiederm@xmission.com Subject: Re: [PATCH 2/2] binfmt: Slightly simplify elf_fdpic_map_file() X-SA-Exim-Version: 4.2.1 (built Sat, 08 Feb 2020 21:53:50 +0000) X-SA-Exim-Scanned: Yes (on in01.mta.xmission.com) X-Rspamd-Queue-Id: 1093D20008 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: e34i3yf66aa79caeeksmw5uu1m1zwy8o X-HE-Tag: 1685291663-318825 X-HE-Meta: U2FsdGVkX1+is68rKE75l8+9MWTwIjCwuuC3StiNVOtVP5x+phg/5QVGml6rGVbl/KnfniQ9MM/UaljAzHfBK2oN8akfyESz8o8QC6r0UkiIOfh3wvDcdo/VwTfDMoxhmJAlyzUHb9gGFGly9c5qFCcvZ0btqbosAuOTh3QlzQRz1WiDpB46dwHxAdd3ZKunZ8+VRaDPWCjh8EN4sBuDQwWMv53+vW8DQALdobHgtepIe2hRctJcat0nGARKV12iUIQm7p7wa9Qd72KvAhK/HU/sX5CbUHSOM88CqXv/uWfzU2qGz2TBSOMMdOB2UlyK3aO0olXhwupyErqmsEURZFeIfIoHil9Riqut2z2t9UQDQ4EF7ZaVEpDR4/ZG+l6QPdBIapsRfdwkLln5fJdAqnKl65MXDsoY8VEz0fQTaTOFoynwKZvUcJ3IyebbgLkApMVbEvDpcEQIeTUa3xLmnxBarMz4toaSuT97YA1y08yY7dgsrAnmIAoEkUntouO4GyJvPkDf2daNlTIJ2BJ3scsT+vn6r6SkFl1+yxx4j8hY3ds6/0wThjGMsO5GYcruiqfb6qCrEWrNoXekg3f7bql5lX5ig/SC+6slvpd5oFDV4zLCKZVmrXjfaUFn9BPVCJr6+bQ0gUOr5JPrNZBkUe3yvXiHhoNkz3WR7AqnMt/2k0wdCrHo11LCoLq9CzhhzufoHV8TsInyqXx0a6KoylgFyzzUPCt8EJu1KeNddFWUiCYdSSp93EXL59f9UU0ywvhAi0EgypBsHE9Mv5W7GoE78uIxt2OQCk95Ui6sHg3ggRmCYkJqLtu/EmPhTkfyQBmxCyCKd/AbGyNcXhPZxFJvMKvtZt+V72aOMtYixM51sNYDdmbjuTzwtR1PMBpFdCG0DklLedvJiy1gRI7+lfX/ZNlCuNlOX+IeN031D7fwqDK36kUxf/2iOznkL08EP+VLC/SSW4r0BBofQk4 49AxJkVR 61oCUDBmT53/q6yq+u9j+ATqM+OHUsG+WtuA/2iUP3DkFG7wJ2RMbq2u9RSJJBdQrMtl8k/eaKe1y2uRM/hqQm+svsbmb0XkSchuN85mAHyR8x/qzgYeCM1jg8mJJUkFEDbAszLVZJpUAzC+pXmXI/7+WuKnh3T0sxjRB 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: Christophe JAILLET writes: > There is no point in initializing 'load_addr' and 'seg' here, they are both > re-written just before being used below. > > Doing so, 'load_addr' can be moved in the #ifdef CONFIG_MMU section. > Acked-by: "Eric W. Biederman" Kees do you maybe want to pick these trivial fixes up? > Signed-off-by: Christophe JAILLET > --- > Compile tested on arm, with and without CONFIG_MMU > --- > fs/binfmt_elf_fdpic.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c > index 237ce388d06d..1c6c5832af86 100644 > --- a/fs/binfmt_elf_fdpic.c > +++ b/fs/binfmt_elf_fdpic.c > @@ -743,11 +743,12 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params, > struct elf32_fdpic_loadmap *loadmap; > #ifdef CONFIG_MMU > struct elf32_fdpic_loadseg *mseg; > + unsigned long load_addr; > #endif > struct elf32_fdpic_loadseg *seg; > struct elf32_phdr *phdr; > - unsigned long load_addr, stop; > unsigned nloads, tmp; > + unsigned long stop; > int loop, ret; > > /* allocate a load map table */ > @@ -768,9 +769,6 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params, > loadmap->version = ELF32_FDPIC_LOADMAP_VERSION; > loadmap->nsegs = nloads; > > - load_addr = params->load_addr; > - seg = loadmap->segs; > - > /* map the requested LOADs into the memory space */ > switch (params->flags & ELF_FDPIC_FLAG_ARRANGEMENT) { > case ELF_FDPIC_FLAG_CONSTDISP: