From nobody Sat Oct 22 11:04:07 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mvdkl2xklz4gjK2; Sat, 22 Oct 2022 11:04:15 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mvdkl172Jz3X48; Sat, 22 Oct 2022 11:04:15 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.16.1/8.16.1) with ESMTPS id 29MB47YX002972 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sat, 22 Oct 2022 14:04:10 +0300 (EEST) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by tom.home (8.16.1/8.16.1/Submit) id 29MB47GQ002971; Sat, 22 Oct 2022 14:04:07 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 22 Oct 2022 14:04:07 +0300 From: Konstantin Belousov To: Jessica Clarke Cc: Kristof Provost , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 9cabef3d146e - main - ldd: use direct exec mode unconditionally Message-ID: References: <202210061550.296FoVrm088661@gitrepo.freebsd.org> <7F982005-246F-4607-A17B-08C81CE65E0B@FreeBSD.org> <6AEBEA3C-24DD-44AA-8B59-8DCADF62CAFF@FreeBSD.org> <9248FC86-7ACB-4099-978B-4A58CE68743D@freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <9248FC86-7ACB-4099-978B-4A58CE68743D@freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on tom.home X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Rspamd-Queue-Id: 4Mvdkl172Jz3X48 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N On Sat, Oct 22, 2022 at 02:32:22AM +0100, Jessica Clarke wrote: > On 22 Oct 2022, at 02:13, Konstantin Belousov wrote: > > > > On Fri, Oct 21, 2022 at 03:10:59PM +0200, Kristof Provost wrote: > >> On 21 Oct 2022, at 15:07, Konstantin Belousov wrote: > >>> On Fri, Oct 21, 2022 at 02:54:59PM +0200, Kristof Provost wrote: > >>>> On 21 Oct 2022, at 14:50, Konstantin Belousov wrote: > >>>>> On Fri, Oct 21, 2022 at 02:18:04PM +0200, Kristof Provost wrote: > >>>>>> On 6 Oct 2022, at 17:50, Konstantin Belousov wrote: > >>>>>>> The branch main has been updated by kib: > >>>>>>> > >>>>>>> URL: https://cgit.FreeBSD.org/src/commit/?id=9cabef3d146e9a844813b6bc8952d6cf2e9d45e5 > >>>>>>> > >>>>>>> commit 9cabef3d146e9a844813b6bc8952d6cf2e9d45e5 > >>>>>>> Author: Konstantin Belousov > >>>>>>> AuthorDate: 2022-09-21 13:55:44 +0000 > >>>>>>> Commit: Konstantin Belousov > >>>>>>> CommitDate: 2022-10-06 15:50:26 +0000 > >>>>>>> > >>>>>>> ldd: use direct exec mode unconditionally > >>>>>>> > >>>>>>> Trying to exec malformed or unusual binary, for instance, a > >>>>>>> non-FreeBSD > >>>>>>> ABI, or using a non-standard interpreter, might give > >>>>>>> unexpected > >>>>>>> outcome. > >>>>>>> > >>>>>>> Reported by: The UK's National Cyber Security Centre (NCSC) > >>>>>>> Reviewed by: emaste, markj, philip > >>>>>>> Discussed with: jhb > >>>>>>> Sponsored by: The FreeBSD Foundation > >>>>>>> admbug: 991 > >>>>>>> PR: 127276, 175339, 231926 > >>>>>>> MFC after: 1 week > >>>>>>> Differential revision: https://reviews.freebsd.org/D36650 > >>>>>>> > >>>>>> This appears to break things for armv7 (running on aarch64). > >>>>>> > >>>>>> This manifests while building pfsense (for 3100 / armv7), which we > >>>>>> do on an > >>>>>> aarch64 vm (to avoid having to deal with qemu, and because it’s > >>>>>> faster). > >>>>>> > >>>>>> During that build a couple ports fail to build, including > >>>>>> databases/sqlite3. > >>>>>> It fails running `/usr/bin/ldd -a "/wrkdirs/usr/ports/databases/sqlite3/work-default/stage/usr/local/bin/sqlite3" "/wrkdirs/usr/ports/databases/sqlite3/work-default/stage/usr/local/lib/libsqlite3.so”`, > >>>>>> which produces: > >>>>>> > >>>>>> ld-elf.so.1: /wrkdirs/usr/ports/databases/sqlite3/work-default/stage/usr/local/bin/sqlite3: > >>>>>> mmap of entire address space failed: Cannot allocate memory > >>>>>> /wrkdirs/usr/ports/databases/sqlite3/work-default/stage/usr/local/bin/sqlite3: > >>>>>> exit status 1 > >>>>>> > >>>>>> That fails doing the `mapbase = mmap(base_addr, mapsize, PROT_NONE, > >>>>>> base_flags, -1, 0);` call in rtld-elf’s map_object():217. > >>>>>> That call > >>>>>> does > >>>>>> `mmap(0x10000, 0x1dc000, PROT_NONE, 0x6010, -1, 0) => 0xffffffff`. > >>>>>> > >>>>>> With this patch reverted we can build successfully. > >>>>> > >>>>> Can you manually invoke ldd on the binary under ktrace -i, and > >>>>> show me > >>>>> the > >>>>> kdump output? > >>>>> > >>>> I might be doing something wrong: > >>>> > >>>> # ktrace -i /usr/obj/usr/src/arm.armv7/usr.bin/ldd/ldd -a "/wrkdirs/usr/ports/databases/sqlite3/work-default/stage/usr/local/bin/sqlite3" > >>>> ld-elf.so.1: /wrkdirs/usr/ports/databases/sqlite3/work-default/stage/usr/local/bin/sqlite3: > >>>> mmap of entire address space failed: Cannot allocate memory > >>>> /wrkdirs/usr/ports/databases/sqlite3/work-default/stage/usr/local/bin/sqlite3: > >>>> exit status 1 > >>>> # kdump -f ktrace.out > >>>> 16 @ UNKNOWN(265) > >>>> kdump: data too short > >>>> # > >>>> > >>>> Perhaps because this is running in a jail? > >>> You need to run host-native kdump, because your kernel is arm64, I > >>> guess. > >>> > >> That seemed to do the trick: > > > > Please try something along this lines: > > > > diff --git a/sys/arm64/include/elf.h b/sys/arm64/include/elf.h > > index 3f7c3964d428..22e968c632bf 100644 > > --- a/sys/arm64/include/elf.h > > +++ b/sys/arm64/include/elf.h > > @@ -86,7 +86,7 @@ __ElfType(Auxinfo); > > #endif > > > > #if __ELF_WORD_SIZE == 32 > > -#define ET_DYN_LOAD_ADDR 0x12000 > > +#define ET_DYN_LOAD_ADDR 0x01001000 > > #else > > #define ET_DYN_LOAD_ADDR 0x100000 > > #endif > > Ouch... sys/arm’s is better at 0x500000 but that’s still only ~4.9 MiB > above LLD’s default image base of 0x10000 so I could see that being hit > a bunch. Then again 0x01001000 only gives ~15.9 MiB, which isn’t great, > but other architectures seem bad too... I put initial tweaking change into https://reviews.freebsd.org/D37085 Feel free to comment/suggest better load addresses for use.