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 X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F62BCA9EAF for ; Thu, 24 Oct 2019 16:28:48 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 519BE20650 for ; Thu, 24 Oct 2019 16:28:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 519BE20650 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:47082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNfyg-000886-Rm for qemu-devel@archiver.kernel.org; Thu, 24 Oct 2019 12:28:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49618) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNfEt-00058M-UY for qemu-devel@nongnu.org; Thu, 24 Oct 2019 11:41:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNfEr-00017B-9C for qemu-devel@nongnu.org; Thu, 24 Oct 2019 11:41:27 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:36117) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iNfEq-00015Y-Gp for qemu-devel@nongnu.org; Thu, 24 Oct 2019 11:41:25 -0400 Received: from [192.168.100.1] ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue011 [213.165.67.103]) with ESMTPSA (Nemesis) id 1MgNMV-1hnWb52XTb-00huh9; Thu, 24 Oct 2019 17:41:16 +0200 Subject: Re: [PATCH v3] linux-user: manage binfmt-misc preserve-arg[0] flag To: qemu-devel@nongnu.org References: <20191024153847.31815-1-laurent@vivier.eu> From: Laurent Vivier Autocrypt: addr=laurent@vivier.eu; prefer-encrypt=mutual; keydata= mQINBFYFJhkBEAC2me7w2+RizYOKZM+vZCx69GTewOwqzHrrHSG07MUAxJ6AY29/+HYf6EY2 WoeuLWDmXE7A3oJoIsRecD6BXHTb0OYS20lS608anr3B0xn5g0BX7es9Mw+hV/pL+63EOCVm SUVTEQwbGQN62guOKnJJJfphbbv82glIC/Ei4Ky8BwZkUuXd7d5NFJKC9/GDrbWdj75cDNQx UZ9XXbXEKY9MHX83Uy7JFoiFDMOVHn55HnncflUncO0zDzY7CxFeQFwYRbsCXOUL9yBtqLer Ky8/yjBskIlNrp0uQSt9LMoMsdSjYLYhvk1StsNPg74+s4u0Q6z45+l8RAsgLw5OLtTa+ePM JyS7OIGNYxAX6eZk1+91a6tnqfyPcMbduxyBaYXn94HUG162BeuyBkbNoIDkB7pCByed1A7q q9/FbuTDwgVGVLYthYSfTtN0Y60OgNkWCMtFwKxRaXt1WFA5ceqinN/XkgA+vf2Ch72zBkJL RBIhfOPFv5f2Hkkj0MvsUXpOWaOjatiu0fpPo6Hw14UEpywke1zN4NKubApQOlNKZZC4hu6/ 8pv2t4HRi7s0K88jQYBRPObjrN5+owtI51xMaYzvPitHQ2053LmgsOdN9EKOqZeHAYG2SmRW LOxYWKX14YkZI5j/TXfKlTpwSMvXho+efN4kgFvFmP6WT+tPnwARAQABtCJMYXVyZW50IFZp dmllciA8bGF1cmVudEB2aXZpZXIuZXU+iQI4BBMBAgAiBQJWBTDeAhsDBgsJCAcDAgYVCAIJ CgsEFgIDAQIeAQIXgAAKCRDzDDi9Py++PCEdD/oD8LD5UWxhQrMQCsUgLlXCSM7sxGLkwmmF ozqSSljEGRhffxZvO35wMFcdX9Z0QOabVoFTKrT04YmvbjsErh/dP5zeM/4EhUByeOS7s6Yl HubMXVQTkak9Wa9Eq6irYC6L41QNzz/oTwNEqL1weV1+XC3TNnht9B76lIaELyrJvRfgsp9M rE+PzGPo5h7QHWdL/Cmu8yOtPLa8Y6l/ywEJ040IoiAUfzRoaJs2csMXf0eU6gVBhCJ4bs91 jtWTXhkzdl4tdV+NOwj3j0ukPy+RjqeL2Ej+bomnPTOW8nAZ32dapmu7Fj7VApuQO/BSIHyO NkowMMjB46yohEepJaJZkcgseaus0x960c4ua/SUm/Nm6vioRsxyUmWd2nG0m089pp8LPopq WfAk1l4GciiMepp1Cxn7cnn1kmG6fhzedXZ/8FzsKjvx/aVeZwoEmucA42uGJ3Vk9TiVdZes lqMITkHqDIpHjC79xzlWkXOsDbA2UY/P18AtgJEZQPXbcrRBtdSifCuXdDfHvI+3exIdTpvj BfbgZAar8x+lcsQBugvktlQWPfAXZu4Shobi3/mDYMEDOE92dnNRD2ChNXg2IuvAL4OW40wh gXlkHC1ZgToNGoYVvGcZFug1NI+vCeCFchX+L3bXyLMg3rAfWMFPAZLzn42plIDMsBs+x2yP +bkCDQRWBSYZARAAvFJBFuX9A6eayxUPFaEczlMbGXugs0mazbOYGlyaWsiyfyc3PStHLFPj rSTaeJpPCjBJErwpZUN4BbpkBpaJiMuVO6egrC8Xy8/cnJakHPR2JPEvmj7Gm/L9DphTcE15 92rxXLesWzGBbuYxKsj8LEnrrvLyi3kNW6B5LY3Id+ZmU8YTQ2zLuGV5tLiWKKxc6s3eMXNq wrJTCzdVd6ThXrmUfAHbcFXOycUyf9vD+s+WKpcZzCXwKgm7x1LKsJx3UhuzT8ier1L363RW ZaJBZ9CTPiu8R5NCSn9V+BnrP3wlFbtLqXp6imGhazT9nJF86b5BVKpF8Vl3F0/Y+UZ4gUwL d9cmDKBcmQU/JaRUSWvvolNu1IewZZu3rFSVgcpdaj7F/1aC0t5vLdx9KQRyEAKvEOtCmP4m 38kU/6r33t3JuTJnkigda4+Sfu5kYGsogeYG6dNyjX5wpK5GJIJikEhdkwcLM+BUOOTi+I9u tX03BGSZo7FW/J7S9y0l5a8nooDs2gBRGmUgYKqQJHCDQyYut+hmcr+BGpUn9/pp2FTWijrP inb/Pc96YDQLQA1q2AeAFv3Rx3XoBTGl0RCY4KZ02c0kX/dm3eKfMX40XMegzlXCrqtzUk+N 8LeipEsnOoAQcEONAWWo1HcgUIgCjhJhBEF0AcELOQzitbJGG5UAEQEAAYkCHwQYAQIACQUC VgUmGQIbDAAKCRDzDDi9Py++PCD3D/9VCtydWDdOyMTJvEMRQGbx0GacqpydMEWbE3kUW0ha US5jz5gyJZHKR3wuf1En/3z+CEAEfP1M3xNGjZvpaKZXrgWaVWfXtGLoWAVTfE231NMQKGoB w2Dzx5ivIqxikXB6AanBSVpRpoaHWb06tPNxDL6SVV9lZpUn03DSR6gZEZvyPheNWkvz7bE6 FcqszV/PNvwm0C5Ju7NlJA8PBAQjkIorGnvN/vonbVh5GsRbhYPOc/JVwNNr63P76rZL8Gk/ hb3xtcIEi5CCzab45+URG/lzc6OV2nTj9Lg0SNcRhFZ2ILE3txrmI+aXmAu26+EkxLLfqCVT ohb2SffQha5KgGlOSBXustQSGH0yzzZVZb+HZPEvx6d/HjQ+t9sO1bCpEgPdZjyMuuMp9N1H ctbwGdQM2Qb5zgXO+8ZSzwC+6rHHIdtcB8PH2j+Nd88dVGYlWFKZ36ELeZxD7iJflsE8E8yg OpKgu3nD0ahBDqANU/ZmNNarBJEwvM2vfusmNnWm3QMIwxNuJghRyuFfx694Im1js0ZY3LEU JGSHFG4ZynA+ZFUPA6Xf0wHeJOxGKCGIyeKORsteIqgnkINW9fnKJw2pgk8qHkwVc3Vu+wGS ZiJK0xFusPQehjWTHn9WjMG1zvQ5TQQHxau/2FkP45+nRPco6vVFQe8JmgtRF8WFJA== Message-ID: <049854b7-51fe-5ca7-2173-484b5b98c475@vivier.eu> Date: Thu, 24 Oct 2019 17:41:15 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.1 MIME-Version: 1.0 In-Reply-To: <20191024153847.31815-1-laurent@vivier.eu> Content-Type: text/plain; charset=utf-8 Content-Language: fr Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:k0EZNUfuJ47O2QIbUzvAmZx1SbojzIiq8DwejJy+mrmCgLFl5Sp Q8nvKaUA7QqK+z+eiWbMSCnAV3izg3OjnthH66ShLl3LP3my0CWOVkq20Ka6x4n9O77hcB2 5iTug+Fyqy6GzEJdQGmBodSBOoKnCJhciS+a8GxOqGI9xOE+BuzrhJ59IcQSabu3sDqQPA6 bgHLZf6ls1g34EwEX25wQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:GowoQiDoGxU=:2kgn5I24RYMlWs6cprQ8b7 etUmHYWZOrzDvp8/W9kZ2y3lkFMeFPfbLbYnesyEFz+8IE/YUjXKhtClAPVUQwQD4WifrJ1Pg 1H/RtJzW2ZtFqnNEFu/zfbI5vUTSL1R2xxUUzWixmtcBcpRzOs0vEOxOyO5HKWImOgMlBi8vK pqRJjm0cC+re1b9o2nD4SHP5D9FZa3Lwe6hAgRmyUrFKOobWOssrGAJZf7lbarAIIeuhGgkL1 62fUydLs2MsiK0RG6OGfy0QnAfTgbAkNLEdA/4+A3ZgxTTgFb7VXbHV3TzSRqilO2J2zPF6RC rrzC5OfqVkdUfyqGjcsz89ONeKYDZMz5E9pcwRpG1xshj+wE7R58Y2lYo92Ip1tsm9TKwslpf B68Q44xBEuFOx9RpkdSH/8sQixRDO/wYAQPEderm42DtmdpWCeF5CR/1lorJfXsOOO37oSfHw Amzo2gTJ4MQhXBZvt3hb2AhMuiKZPTGB3aC1XXY0VY/mTxatAIW7DH+IfSBaVY1JF5RFj+uxM nzt/2uRastfm9CxKv/5s2LJx4/f9qxjuJUyM211H2LUHsB6e/iitMuzLh4amucklI2svyS3dE QB6Y0F0duw1oTka9vuzNPI3awXD56BwNneaIBm5x89NylNq6e3shGwxYVNlvmSr6wHdAjjNQ5 Q1d0iaIuVvsYgzsso4PTcVGLZMumDvVSYebKMd/q9f1YTkJXqpT8piJMPWTitgDAQDjd9gy0T RjXAqf4ZpPptYrEDJBv3NlpIXGP8ZLX4rV/ZL0LHJ1pNElmIsnRj3fJT/Wb5Q7B/PUQJtnYdY xpOP2G7j6wak4YUiAbbWAL0ixEAef194Gs5Vx9xc9C4fLIGl+Qh+YyKTOMFL68QdqOaBK0apJ qU301BV1RT+jBd35Gq5pwHBjSwg8TpGXy5fb8pDP8= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.131 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Christophe de Dinechin , Peter Maydell , Riku Voipio , John Paul Adrian Glaubitz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Le 24/10/2019 à 17:38, Laurent Vivier a écrit : > Add --preserve-argv0 in qemu-binfmt-conf.sh to configure the preserve-argv0 > flag. > > Now, if QEMU is started with -0 or QEMU_ARGV0 and an empty parameter > argv[0] (the full pathname provided by binfmt-misc) is removed and > replaced by argv[1] (the original argv[0] provided by binfmt-misc when > 'P'/preserve-arg[0] is set) > > For instance: > > $ sudo QEMU_ARGV0= chroot m68k-chroot sh -c 'echo $0' > sh > > without this patch: > > $ sudo chroot m68k-chroot sh -c 'echo $0' > /usr/bin/sh > > QEMU can be forced to always use preserve-argv[0] at configuration > time with --force-preserve-argv0 > > Signed-off-by: Laurent Vivier > --- missing revision history: v3: s/preserve-arg0/preserve-argv0/ v2: add --force-preserve-argv0 configure option > configure | 8 +++++++ > linux-user/main.c | 24 +++++++++++++++++++- > scripts/qemu-binfmt-conf.sh | 44 +++++++++++++++++++++++-------------- > 3 files changed, 58 insertions(+), 18 deletions(-) > > diff --git a/configure b/configure > index 145fcabbb3c3..94c41f0a068a 100755 > --- a/configure > +++ b/configure > @@ -497,6 +497,7 @@ sheepdog="yes" > libxml2="" > debug_mutex="no" > libpmem="" > +force_preserve_argv0="no" > default_devices="yes" > > supported_cpu="no" > @@ -1529,6 +1530,8 @@ for opt do > ;; > --disable-xkbcommon) xkbcommon=no > ;; > + --force-preserve-argv0) force_preserve_argv0=yes > + ;; > *) > echo "ERROR: unknown option $opt" > echo "Try '$0 --help' for more information" > @@ -1710,6 +1713,8 @@ Advanced options (experts only): > --enable-profiler profiler support > --enable-debug-stack-usage > track the maximum stack usage of stacks created by qemu_alloc_stack > + --force-preserve-argv0 for linux-user only, force the use of binfmt_misc 'P' > + flag (preserve-argv[0]) > > Optional features, enabled with --enable-FEATURE and > disabled with --disable-FEATURE, default is enabled if available: > @@ -7633,6 +7638,9 @@ if test "$target_user_only" = "yes" ; then > fi > if test "$target_linux_user" = "yes" ; then > echo "CONFIG_LINUX_USER=y" >> $config_target_mak > + if test "$force_preserve_argv0" = "yes" ; then > + echo "CONFIG_FORCE_PRESERVE_ARGV0=y" >> $config_target_mak > + fi > fi > list="" > if test ! -z "$gdb_xml_files" ; then > diff --git a/linux-user/main.c b/linux-user/main.c > index 560d053f7249..1b4df24ef483 100644 > --- a/linux-user/main.c > +++ b/linux-user/main.c > @@ -616,6 +616,7 @@ int main(int argc, char **argv, char **envp) > int ret; > int execfd; > unsigned long max_reserved_va; > + bool preserve_argv0; > > error_init(argv[0]); > module_call_init(MODULE_INIT_TRACE); > @@ -664,6 +665,9 @@ int main(int argc, char **argv, char **envp) > > init_qemu_uname_release(); > > + /* > + * Manage binfmt-misc open-binary flag > + */ > execfd = qemu_getauxval(AT_EXECFD); > if (execfd == 0) { > execfd = open(exec_path, O_RDONLY); > @@ -673,6 +677,24 @@ int main(int argc, char **argv, char **envp) > } > } > > + /* > + * argv0 with an empty string will set argv[optind + 1] > + * as target_argv[0] > + */ > +#ifdef CONFIG_FORCE_PRESERVE_ARGV0 > + preserve_argv0 = true; > +#else > + preserve_argv0 = (argv0 != NULL && argv0[0] == 0); > +#endif > + /* > + * Manage binfmt-misc preserve-arg[0] flag > + * argv[optind] full path to the binary > + * argv[optind + 1] original argv[0] > + */ > + if (optind + 1 < argc && preserve_argv0) { > + optind++; > + } > + > if (cpu_model == NULL) { > cpu_model = cpu_get_model(get_elf_eflags(execfd)); > } > @@ -777,7 +799,7 @@ int main(int argc, char **argv, char **envp) > * argv[0] pointer with the given one. > */ > i = 0; > - if (argv0 != NULL) { > + if (argv0 != NULL && argv0[0] != 0) { > target_argv[i++] = strdup(argv0); > } > for (; i < target_argc; i++) { > diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh > index b5a16742a149..275d3cf57e83 100755 > --- a/scripts/qemu-binfmt-conf.sh > +++ b/scripts/qemu-binfmt-conf.sh > @@ -170,25 +170,27 @@ usage() { > Usage: qemu-binfmt-conf.sh [--qemu-path PATH][--debian][--systemd CPU] > [--help][--credential yes|no][--exportdir PATH] > [--persistent yes|no][--qemu-suffix SUFFIX] > + [--preserve-argv0 yes|no] > > Configure binfmt_misc to use qemu interpreter > > - --help: display this usage > - --qemu-path: set path to qemu interpreter ($QEMU_PATH) > - --qemu-suffix: add a suffix to the default interpreter name > - --debian: don't write into /proc, > - instead generate update-binfmts templates > - --systemd: don't write into /proc, > - instead generate file for systemd-binfmt.service > - for the given CPU. If CPU is "ALL", generate a > - file for all known cpus > - --exportdir: define where to write configuration files > - (default: $SYSTEMDDIR or $DEBIANDIR) > - --credential: if yes, credential and security tokens are > - calculated according to the binary to interpret > - --persistent: if yes, the interpreter is loaded when binfmt is > - configured and remains in memory. All future uses > - are cloned from the open file. > + --help: display this usage > + --qemu-path: set path to qemu interpreter ($QEMU_PATH) > + --qemu-suffix: add a suffix to the default interpreter name > + --debian: don't write into /proc, > + instead generate update-binfmts templates > + --systemd: don't write into /proc, > + instead generate file for systemd-binfmt.service > + for the given CPU. If CPU is "ALL", generate a > + file for all known cpus > + --exportdir: define where to write configuration files > + (default: $SYSTEMDDIR or $DEBIANDIR) > + --credential: if yes, credential and security tokens are > + calculated according to the binary to interpret > + --persistent: if yes, the interpreter is loaded when binfmt is > + configured and remains in memory. All future uses > + are cloned from the open file. > + --preserve-argv0 preserve argv[0] > > To import templates with update-binfmts, use : > > @@ -261,6 +263,9 @@ qemu_generate_register() { > if [ "$PERSISTENT" = "yes" ] ; then > flags="${flags}F" > fi > + if [ "$PRESERVE_ARG0" = "yes" ] ; then > + flags="${flags}P" > + fi > > echo ":qemu-$cpu:M::$magic:$mask:$qemu:$flags" > } > @@ -322,9 +327,10 @@ DEBIANDIR="/usr/share/binfmts" > QEMU_PATH=/usr/local/bin > CREDENTIAL=no > PERSISTENT=no > +PRESERVE_ARG0=no > QEMU_SUFFIX="" > > -options=$(getopt -o ds:Q:S:e:hc:p: -l debian,systemd:,qemu-path:,qemu-suffix:,exportdir:,help,credential:,persistent: -- "$@") > +options=$(getopt -o ds:Q:S:e:hc:p:0: -l debian,systemd:,qemu-path:,qemu-suffix:,exportdir:,help,credential:,persistent:,preserve-argv0: -- "$@") > eval set -- "$options" > > while true ; do > @@ -380,6 +386,10 @@ while true ; do > shift > PERSISTENT="$1" > ;; > + -0|--preserve-argv0) > + shift > + PRESERVE_ARG0="$1" > + ;; > *) > break > ;; >