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 8D388C433EF for ; Wed, 20 Apr 2022 16:17:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E06856B0072; Wed, 20 Apr 2022 12:17:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D8CD96B0073; Wed, 20 Apr 2022 12:17:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C069B6B0074; Wed, 20 Apr 2022 12:17:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0136.hostedemail.com [216.40.44.136]) by kanga.kvack.org (Postfix) with ESMTP id A84E06B0072 for ; Wed, 20 Apr 2022 12:17:25 -0400 (EDT) Received: from smtpin31.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 60111A3244 for ; Wed, 20 Apr 2022 16:17:25 +0000 (UTC) X-FDA: 79377762450.31.6C74E3C Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by imf07.hostedemail.com (Postfix) with ESMTP id B4EE64001D for ; Wed, 20 Apr 2022 16:17:24 +0000 (UTC) Received: by mail-pj1-f46.google.com with SMTP id n11-20020a17090a73cb00b001d1d3a7116bso4051872pjk.0 for ; Wed, 20 Apr 2022 09:17:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dabbelt-com.20210112.gappssmtp.com; s=20210112; h=date:subject:in-reply-to:cc:from:to:message-id:mime-version :content-transfer-encoding; bh=R3vTf19oMKRes6BtKfmN/qkhfJtJqpPYYlTIkqXViAo=; b=Sru+C6PlamA8jZ8NcDpobfoMpyR1tI0BLLOYSnhuMjMpMKwPJduh7wgA5KxBWIkND4 tKKndEm9Pa3MJV6a/uGti7n/QQJH7PPCjSLfGNQQEtc4MF8lMAWpq2K3FT1u+5vr38Ln BNE2xStACiq1NRMNOcY3icRI2T6I3qwyXUm2UenfYb0ZPkYR93Gp4eoKgOtac1dGcq9+ DzFyhDjLBEVcdvwClpFM0puu5Ylletc+nvUVSVz6qE3NjHIDs/8ydyqXukGdV6udYKOq iZCso/asGSaq+ghk4ecxZ+ndXBzExktwvz0I4Uy5D3ZiId7+XblIvx2XOwGtj48xPtfS YGOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:subject:in-reply-to:cc:from:to:message-id :mime-version:content-transfer-encoding; bh=R3vTf19oMKRes6BtKfmN/qkhfJtJqpPYYlTIkqXViAo=; b=Im7+0IHaEpX2/swiM7C6tpszcA9Y/2JxidAQFNcHRn1mNETXCNJy1erdIqmLquUJJS w+LYEnWai3T65MCtNpENwgQVpODjf0k/tyYZKoGvlettqmZ5JYKooru3Toi9+qBgUjrO 9rDivv19K5M//5RPYRykp1hi7+wQUqK7U0Pt6srcbaRqw7Q0vAJ5btLagElbHvQbNuXW LriIPU5aONBhxPMxmq/QHtgxyL6Ji/Oa7FnOdmvjcmmaS5xbACk6OR2U6bIeXJN5k3Ha yJ4qS1udBU/QK5iUh7hMa/LlHYz+rJDeck2n2Z/t6P6Ba2PVM5gnKCqZnyNXmVIdQ8MF 4d9A== X-Gm-Message-State: AOAM531Yk6YNo816K92hJSS4qmmv5eeUtfaMNTwflQ578Sg2fJvzC+o6 P9mgRrJtCMjm3OLLTBPi5epWtg== X-Google-Smtp-Source: ABdhPJwthUt+XclRvJbnn9uqQazL2RR/Zs0U933iLuyatysqRD2khuenep71u0U+5+bXwtIAJPJ1rw== X-Received: by 2002:a17:90b:1b06:b0:1d1:6633:5ec2 with SMTP id nu6-20020a17090b1b0600b001d166335ec2mr5402715pjb.103.1650471443508; Wed, 20 Apr 2022 09:17:23 -0700 (PDT) Received: from localhost ([12.3.194.138]) by smtp.gmail.com with ESMTPSA id 16-20020a621410000000b0050aca5f79f5sm3374244pfu.97.2022.04.20.09.17.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 09:17:22 -0700 (PDT) Date: Wed, 20 Apr 2022 09:17:22 -0700 (PDT) X-Google-Original-Date: Wed, 20 Apr 2022 09:16:48 PDT (-0700) Subject: Re: [PATCH] binfmt_flat: Remove shared library support In-Reply-To: <87levzzts4.fsf_-_@email.froward.int.ebiederm.org> CC: keescook@chromium.org, Niklas.Cassel@wdc.com, viro@zeniv.linux.org.uk, Paul Walmsley , aou@eecs.berkeley.edu, vapier@gentoo.org, stable@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, linux-arch@vger.kernel.org, geert@linux-m68k.org, linux-m68k@lists.linux-m68k.org, gerg@linux-m68k.org, linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org, ysato@users.sourceforge.jp, dalias@libc.org From: Palmer Dabbelt To: ebiederm@xmission.com, damien.lemoal@opensource.wdc.com Message-ID: Mime-Version: 1.0 (MHng) Content-Type: text/plain; charset=utf-8; format=flowed X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: B4EE64001D X-Stat-Signature: wrcci9ged35tpguh1mgk1qay1icguqs8 Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=dabbelt-com.20210112.gappssmtp.com header.s=20210112 header.b=Sru+C6Pl; dmarc=none; spf=pass (imf07.hostedemail.com: domain of palmer@dabbelt.com designates 209.85.216.46 as permitted sender) smtp.mailfrom=palmer@dabbelt.com X-HE-Tag: 1650471444-612256 Content-Transfer-Encoding: quoted-printable 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: On Wed, 20 Apr 2022 07:58:03 PDT (-0700), ebiederm@xmission.com wrote: > > In a recent discussion[1] it was reported that the binfmt_flat library > support was only ever used on m68k and even on m68k has not been used > in a very long time. > > The structure of binfmt_flat is different from all of the other binfmt > implementations becasue of this shared library support and it made > life and code review more effort when I refactored the code in fs/exec.= c. > > Since in practice the code is dead remove the binfmt_flat shared libara= ry > support and make maintenance of the code easier. > > [1] https://lkml.kernel.org/r/81788b56-5b15-7308-38c7-c7f2502c4e15@linu= x-m68k.org > Signed-off-by: "Eric W. Biederman" > --- > > Can the binfmt_flat folks please verify that the shared library support > really isn't used? I don't actually know follow the RISC-V flat support, last I heard it was= still sort of just in limbo (some toolchain/userspace bugs th at needed to be s= orted out). Damien would know better, though, he's already on the thread. I'l= l leave it up to him to ack this one, if you were even looking for anything= from the RISC-V folks at all (we don't have this in any defconfigs). > Was binfmt_flat being enabled on arm and sh the mistake it looks like? > > arch/arm/configs/lpc18xx_defconfig | 1 - > arch/arm/configs/mps2_defconfig | 1 - > arch/arm/configs/stm32_defconfig | 1 - > arch/arm/configs/vf610m4_defconfig | 1 - > arch/sh/configs/rsk7201_defconfig | 1 - > arch/sh/configs/rsk7203_defconfig | 1 - > arch/sh/configs/se7206_defconfig | 1 - > fs/Kconfig.binfmt | 6 - > fs/binfmt_flat.c | 190 ++++++----------------------- > 9 files changed, 40 insertions(+), 163 deletions(-) > > diff --git a/arch/arm/configs/lpc18xx_defconfig b/arch/arm/configs/lpc1= 8xx_defconfig > index be882ea0eee4..688c9849eec8 100644 > --- a/arch/arm/configs/lpc18xx_defconfig > +++ b/arch/arm/configs/lpc18xx_defconfig > @@ -30,7 +30,6 @@ CONFIG_ARM_APPENDED_DTB=3Dy > # CONFIG_BLK_DEV_BSG is not set > CONFIG_BINFMT_FLAT=3Dy > CONFIG_BINFMT_ZFLAT=3Dy > -CONFIG_BINFMT_SHARED_FLAT=3Dy > # CONFIG_COREDUMP is not set > CONFIG_NET=3Dy > CONFIG_PACKET=3Dy > diff --git a/arch/arm/configs/mps2_defconfig b/arch/arm/configs/mps2_de= fconfig > index 89f4a6ff30bd..c1e98e33a348 100644 > --- a/arch/arm/configs/mps2_defconfig > +++ b/arch/arm/configs/mps2_defconfig > @@ -23,7 +23,6 @@ CONFIG_PREEMPT_VOLUNTARY=3Dy > CONFIG_ZBOOT_ROM_TEXT=3D0x0 > CONFIG_ZBOOT_ROM_BSS=3D0x0 > CONFIG_BINFMT_FLAT=3Dy > -CONFIG_BINFMT_SHARED_FLAT=3Dy > # CONFIG_COREDUMP is not set > # CONFIG_SUSPEND is not set > CONFIG_NET=3Dy > diff --git a/arch/arm/configs/stm32_defconfig b/arch/arm/configs/stm32_= defconfig > index 551db328009d..71d6bfcf4551 100644 > --- a/arch/arm/configs/stm32_defconfig > +++ b/arch/arm/configs/stm32_defconfig > @@ -28,7 +28,6 @@ CONFIG_ZBOOT_ROM_BSS=3D0x0 > CONFIG_XIP_KERNEL=3Dy > CONFIG_XIP_PHYS_ADDR=3D0x08008000 > CONFIG_BINFMT_FLAT=3Dy > -CONFIG_BINFMT_SHARED_FLAT=3Dy > # CONFIG_COREDUMP is not set > CONFIG_DEVTMPFS=3Dy > CONFIG_DEVTMPFS_MOUNT=3Dy > diff --git a/arch/arm/configs/vf610m4_defconfig b/arch/arm/configs/vf61= 0m4_defconfig > index a89f035c3b01..70fdbfd83484 100644 > --- a/arch/arm/configs/vf610m4_defconfig > +++ b/arch/arm/configs/vf610m4_defconfig > @@ -18,7 +18,6 @@ CONFIG_XIP_KERNEL=3Dy > CONFIG_XIP_PHYS_ADDR=3D0x0f000080 > CONFIG_BINFMT_FLAT=3Dy > CONFIG_BINFMT_ZFLAT=3Dy > -CONFIG_BINFMT_SHARED_FLAT=3Dy > # CONFIG_SUSPEND is not set > # CONFIG_UEVENT_HELPER is not set > # CONFIG_STANDALONE is not set > diff --git a/arch/sh/configs/rsk7201_defconfig b/arch/sh/configs/rsk720= 1_defconfig > index e41526120be1..619c18699459 100644 > --- a/arch/sh/configs/rsk7201_defconfig > +++ b/arch/sh/configs/rsk7201_defconfig > @@ -25,7 +25,6 @@ CONFIG_CMDLINE_OVERWRITE=3Dy > CONFIG_CMDLINE=3D"console=3DttySC0,115200 earlyprintk=3Dserial ignore_= loglevel" > CONFIG_BINFMT_FLAT=3Dy > CONFIG_BINFMT_ZFLAT=3Dy > -CONFIG_BINFMT_SHARED_FLAT=3Dy > CONFIG_PM=3Dy > CONFIG_CPU_IDLE=3Dy > # CONFIG_STANDALONE is not set > diff --git a/arch/sh/configs/rsk7203_defconfig b/arch/sh/configs/rsk720= 3_defconfig > index 6af08fa1ddf8..5a54e2b883f0 100644 > --- a/arch/sh/configs/rsk7203_defconfig > +++ b/arch/sh/configs/rsk7203_defconfig > @@ -30,7 +30,6 @@ CONFIG_CMDLINE_OVERWRITE=3Dy > CONFIG_CMDLINE=3D"console=3DttySC0,115200 earlyprintk=3Dserial ignore_= loglevel" > CONFIG_BINFMT_FLAT=3Dy > CONFIG_BINFMT_ZFLAT=3Dy > -CONFIG_BINFMT_SHARED_FLAT=3Dy > CONFIG_PM=3Dy > CONFIG_CPU_IDLE=3Dy > CONFIG_NET=3Dy > diff --git a/arch/sh/configs/se7206_defconfig b/arch/sh/configs/se7206_= defconfig > index 601d062250d1..122216123e63 100644 > --- a/arch/sh/configs/se7206_defconfig > +++ b/arch/sh/configs/se7206_defconfig > @@ -40,7 +40,6 @@ CONFIG_CMDLINE_OVERWRITE=3Dy > CONFIG_CMDLINE=3D"console=3DttySC3,115200 ignore_loglevel earlyprintk=3D= serial" > CONFIG_BINFMT_FLAT=3Dy > CONFIG_BINFMT_ZFLAT=3Dy > -CONFIG_BINFMT_SHARED_FLAT=3Dy > CONFIG_BINFMT_MISC=3Dy > CONFIG_NET=3Dy > CONFIG_PACKET=3Dy > diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt > index 21c6332fa785..32dff7ba3dda 100644 > --- a/fs/Kconfig.binfmt > +++ b/fs/Kconfig.binfmt > @@ -142,12 +142,6 @@ config BINFMT_ZFLAT > help > Support FLAT format compressed binaries > > -config BINFMT_SHARED_FLAT > - bool "Enable shared FLAT support" > - depends on BINFMT_FLAT > - help > - Support FLAT shared libraries > - > config HAVE_AOUT > def_bool n > > diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c > index 0ad2c7bbaddd..82e4412a9665 100644 > --- a/fs/binfmt_flat.c > +++ b/fs/binfmt_flat.c > @@ -68,11 +68,7 @@ > #define RELOC_FAILED 0xff00ff01 /* Relocation incorrect somewhere */ > #define UNLOADED_LIB 0x7ff000ff /* Placeholder for unused library */ > > -#ifdef CONFIG_BINFMT_SHARED_FLAT > -#define MAX_SHARED_LIBS (4) > -#else > -#define MAX_SHARED_LIBS (1) > -#endif > +#define MAX_SHARED_LIBS (1) > > #ifdef CONFIG_BINFMT_FLAT_NO_DATA_START_OFFSET > #define DATA_START_OFFSET_WORDS (0) > @@ -92,10 +88,6 @@ struct lib_info { > } lib_list[MAX_SHARED_LIBS]; > }; > > -#ifdef CONFIG_BINFMT_SHARED_FLAT > -static int load_flat_shared_library(int id, struct lib_info *p); > -#endif > - > static int load_flat_binary(struct linux_binprm *); > > static struct linux_binfmt flat_format =3D { > @@ -307,51 +299,18 @@ static int decompress_exec(struct linux_binprm *b= prm, loff_t fpos, char *dst, > /*********************************************************************= *******/ > > static unsigned long > -calc_reloc(unsigned long r, struct lib_info *p, int curid, int interna= lp) > +calc_reloc(unsigned long r, struct lib_info *p) > { > unsigned long addr; > - int id; > unsigned long start_brk; > unsigned long start_data; > unsigned long text_len; > unsigned long start_code; > > -#ifdef CONFIG_BINFMT_SHARED_FLAT > - if (r =3D=3D 0) > - id =3D curid; /* Relocs of 0 are always self referring */ > - else { > - id =3D (r >> 24) & 0xff; /* Find ID for this reloc */ > - r &=3D 0x00ffffff; /* Trim ID off here */ > - } > - if (id >=3D MAX_SHARED_LIBS) { > - pr_err("reference 0x%lx to shared library %d", r, id); > - goto failed; > - } > - if (curid !=3D id) { > - if (internalp) { > - pr_err("reloc address 0x%lx not in same module " > - "(%d !=3D %d)", r, curid, id); > - goto failed; > - } else if (!p->lib_list[id].loaded && > - load_flat_shared_library(id, p) < 0) { > - pr_err("failed to load library %d", id); > - goto failed; > - } > - /* Check versioning information (i.e. time stamps) */ > - if (p->lib_list[id].build_date && p->lib_list[curid].build_date && > - p->lib_list[curid].build_date < p->lib_list[id].build_date) { > - pr_err("library %d is younger than %d", id, curid); > - goto failed; > - } > - } > -#else > - id =3D 0; > -#endif > - > - start_brk =3D p->lib_list[id].start_brk; > - start_data =3D p->lib_list[id].start_data; > - start_code =3D p->lib_list[id].start_code; > - text_len =3D p->lib_list[id].text_len; > + start_brk =3D p->lib_list[0].start_brk; > + start_data =3D p->lib_list[0].start_data; > + start_code =3D p->lib_list[0].start_code; > + text_len =3D p->lib_list[0].text_len; > > if (r > start_brk - start_data + text_len) { > pr_err("reloc outside program 0x%lx (0 - 0x%lx/0x%lx)", > @@ -419,7 +378,7 @@ static void old_reloc(unsigned long rl) > /*********************************************************************= *******/ > > static int load_flat_file(struct linux_binprm *bprm, > - struct lib_info *libinfo, int id, unsigned long *extra_stack) > + struct lib_info *libinfo, unsigned long *extra_stack) > { > struct flat_hdr *hdr; > unsigned long textpos, datapos, realdatastart; > @@ -471,14 +430,6 @@ static int load_flat_file(struct linux_binprm *bpr= m, > goto err; > } > > - /* Don't allow old format executables to use shared libraries */ > - if (rev =3D=3D OLD_FLAT_VERSION && id !=3D 0) { > - pr_err("shared libraries are not available before rev 0x%lx\n", > - FLAT_VERSION); > - ret =3D -ENOEXEC; > - goto err; > - } > - > /* > * fix up the flags for the older format, there were all kinds > * of endian hacks, this only works for the simple cases > @@ -529,15 +480,13 @@ static int load_flat_file(struct linux_binprm *bp= rm, > } > > /* Flush all traces of the currently running executable */ > - if (id =3D=3D 0) { > - ret =3D begin_new_exec(bprm); > - if (ret) > - goto err; > + ret =3D begin_new_exec(bprm); > + if (ret) > + goto err; > > - /* OK, This is the point of no return */ > - set_personality(PER_LINUX_32BIT); > - setup_new_exec(bprm); > - } > + /* OK, This is the point of no return */ > + set_personality(PER_LINUX_32BIT); > + setup_new_exec(bprm); > > /* > * calculate the extra space we need to map in > @@ -717,42 +666,40 @@ static int load_flat_file(struct linux_binprm *bp= rm, > text_len -=3D sizeof(struct flat_hdr); /* the real code len */ > > /* The main program needs a little extra setup in the task structure = */ > - if (id =3D=3D 0) { > - current->mm->start_code =3D start_code; > - current->mm->end_code =3D end_code; > - current->mm->start_data =3D datapos; > - current->mm->end_data =3D datapos + data_len; > - /* > - * set up the brk stuff, uses any slack left in data/bss/stack > - * allocation. We put the brk after the bss (between the bss > - * and stack) like other platforms. > - * Userspace code relies on the stack pointer starting out at > - * an address right at the end of a page. > - */ > - current->mm->start_brk =3D datapos + data_len + bss_len; > - current->mm->brk =3D (current->mm->start_brk + 3) & ~3; > + current->mm->start_code =3D start_code; > + current->mm->end_code =3D end_code; > + current->mm->start_data =3D datapos; > + current->mm->end_data =3D datapos + data_len; > + /* > + * set up the brk stuff, uses any slack left in data/bss/stack > + * allocation. We put the brk after the bss (between the bss > + * and stack) like other platforms. > + * Userspace code relies on the stack pointer starting out at > + * an address right at the end of a page. > + */ > + current->mm->start_brk =3D datapos + data_len + bss_len; > + current->mm->brk =3D (current->mm->start_brk + 3) & ~3; > #ifndef CONFIG_MMU > - current->mm->context.end_brk =3D memp + memp_size - stack_len; > + current->mm->context.end_brk =3D memp + memp_size - stack_len; > #endif > - } > > if (flags & FLAT_FLAG_KTRACE) { > pr_info("Mapping is %lx, Entry point is %x, data_start is %x\n", > textpos, 0x00ffffff&ntohl(hdr->entry), ntohl(hdr->data_start)); > pr_info("%s %s: TEXT=3D%lx-%lx DATA=3D%lx-%lx BSS=3D%lx-%lx\n", > - id ? "Lib" : "Load", bprm->filename, > + "Load", bprm->filename, > start_code, end_code, datapos, datapos + data_len, > datapos + data_len, (datapos + data_len + bss_len + 3) & ~3); > } > > /* Store the current module values into the global library structure = */ > - libinfo->lib_list[id].start_code =3D start_code; > - libinfo->lib_list[id].start_data =3D datapos; > - libinfo->lib_list[id].start_brk =3D datapos + data_len + bss_len; > - libinfo->lib_list[id].text_len =3D text_len; > - libinfo->lib_list[id].loaded =3D 1; > - libinfo->lib_list[id].entry =3D (0x00ffffff & ntohl(hdr->entry)) + te= xtpos; > - libinfo->lib_list[id].build_date =3D ntohl(hdr->build_date); > + libinfo->lib_list[0].start_code =3D start_code; > + libinfo->lib_list[0].start_data =3D datapos; > + libinfo->lib_list[0].start_brk =3D datapos + data_len + bss_len; > + libinfo->lib_list[0].text_len =3D text_len; > + libinfo->lib_list[0].loaded =3D 1; > + libinfo->lib_list[0].entry =3D (0x00ffffff & ntohl(hdr->entry)) + tex= tpos; > + libinfo->lib_list[0].build_date =3D ntohl(hdr->build_date); > > /* > * We just load the allocations into some temporary memory to > @@ -774,7 +721,7 @@ static int load_flat_file(struct linux_binprm *bprm= , > if (rp_val =3D=3D 0xffffffff) > break; > if (rp_val) { > - addr =3D calc_reloc(rp_val, libinfo, id, 0); > + addr =3D calc_reloc(rp_val, libinfo); > if (addr =3D=3D RELOC_FAILED) { > ret =3D -ENOEXEC; > goto err; > @@ -810,7 +757,7 @@ static int load_flat_file(struct linux_binprm *bprm= , > return -EFAULT; > relval =3D ntohl(tmp); > addr =3D flat_get_relocate_addr(relval); > - rp =3D (u32 __user *)calc_reloc(addr, libinfo, id, 1); > + rp =3D (u32 __user *)calc_reloc(addr, libinfo); > if (rp =3D=3D (u32 __user *)RELOC_FAILED) { > ret =3D -ENOEXEC; > goto err; > @@ -833,7 +780,7 @@ static int load_flat_file(struct linux_binprm *bprm= , > */ > addr =3D ntohl((__force __be32)addr); > } > - addr =3D calc_reloc(addr, libinfo, id, 0); > + addr =3D calc_reloc(addr, libinfo); > if (addr =3D=3D RELOC_FAILED) { > ret =3D -ENOEXEC; > goto err; > @@ -861,7 +808,7 @@ static int load_flat_file(struct linux_binprm *bprm= , > /* zero the BSS, BRK and stack areas */ > if (clear_user((void __user *)(datapos + data_len), bss_len + > (memp + memp_size - stack_len - /* end brk */ > - libinfo->lib_list[id].start_brk) + /* start brk */ > + libinfo->lib_list[0].start_brk) + /* start brk */ > stack_len)) > return -EFAULT; > > @@ -871,49 +818,6 @@ static int load_flat_file(struct linux_binprm *bpr= m, > } > > > -/*********************************************************************= *******/ > -#ifdef CONFIG_BINFMT_SHARED_FLAT > - > -/* > - * Load a shared library into memory. The library gets its own data > - * segment (including bss) but not argv/argc/environ. > - */ > - > -static int load_flat_shared_library(int id, struct lib_info *libs) > -{ > - /* > - * This is a fake bprm struct; only the members "buf", "file" and > - * "filename" are actually used. > - */ > - struct linux_binprm bprm; > - int res; > - char buf[16]; > - loff_t pos =3D 0; > - > - memset(&bprm, 0, sizeof(bprm)); > - > - /* Create the file name */ > - sprintf(buf, "/lib/lib%d.so", id); > - > - /* Open the file up */ > - bprm.filename =3D buf; > - bprm.file =3D open_exec(bprm.filename); > - res =3D PTR_ERR(bprm.file); > - if (IS_ERR(bprm.file)) > - return res; > - > - res =3D kernel_read(bprm.file, bprm.buf, BINPRM_BUF_SIZE, &pos); > - > - if (res >=3D 0) > - res =3D load_flat_file(&bprm, libs, id, NULL); > - > - allow_write_access(bprm.file); > - fput(bprm.file); > - > - return res; > -} > - > -#endif /* CONFIG_BINFMT_SHARED_FLAT */ > /*********************************************************************= *******/ > > /* > @@ -946,7 +850,7 @@ static int load_flat_binary(struct linux_binprm *bp= rm) > stack_len +=3D (bprm->envc + 1) * sizeof(char *); /* the envp array= */ > stack_len =3D ALIGN(stack_len, FLAT_STACK_ALIGN); > > - res =3D load_flat_file(bprm, &libinfo, 0, &stack_len); > + res =3D load_flat_file(bprm, &libinfo, &stack_len); > if (res < 0) > return res; > > @@ -991,20 +895,6 @@ static int load_flat_binary(struct linux_binprm *b= prm) > */ > start_addr =3D libinfo.lib_list[0].entry; > > -#ifdef CONFIG_BINFMT_SHARED_FLAT > - for (i =3D MAX_SHARED_LIBS-1; i > 0; i--) { > - if (libinfo.lib_list[i].loaded) { > - /* Push previos first to call address */ > - unsigned long __user *sp; > - current->mm->start_stack -=3D sizeof(unsigned long); > - sp =3D (unsigned long __user *)current->mm->start_stack; > - if (put_user(start_addr, sp)) > - return -EFAULT; > - start_addr =3D libinfo.lib_list[i].entry; > - } > - } > -#endif > - > #ifdef FLAT_PLAT_INIT > FLAT_PLAT_INIT(regs); > #endif