From nobody Wed Apr 2 07:29:47 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1583781631; cv=none; d=zohomail.com; s=zohoarc; b=M1Xbjax8BQr5mfP34gp82zVsIHOcV1Oeb64ERMJSTy9nmki0gT8kmkqLvF9iUZMtVK34ugpfP6O4YB6Eviw+eJEFUOpb1dqzS5XRpUt+CwdKFLqVpgV5PpaFmIbPi1/0KbmD0+8fp4DRMnIj5s5ZzZ2gUE2Kq4poPBgCe+1FyS4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583781631; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hg5itl6DJ5VgrLztVEHE4UmDmIPPhd/Uj0mlalgl84g=; b=ebX5XteI53Z+BEG7wkzKiDlZ7TQ2fO7VXvpDZ0Lw5J0QTjK2wliYXbXtrItzg2VPBZK3dzEOq2/pprAhremECSdTGPRvkI2zP6pDQhPcLH8HHO4RNmrhGqpX8tHJzWrteXatRixHvsWThpH8IiyR2JNH0eoWhn9sWQIdrbEyRi0= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1583781631472679.8046291498263; Mon, 9 Mar 2020 12:20:31 -0700 (PDT) Received: from localhost ([::1]:48370 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBNx0-00072O-EJ for importer@patchew.org; Mon, 09 Mar 2020 15:20:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49392) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBNw0-0005j2-Hl for qemu-devel@nongnu.org; Mon, 09 Mar 2020 15:19:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jBNvz-0007P2-5f for qemu-devel@nongnu.org; Mon, 09 Mar 2020 15:19:28 -0400 Received: from smtp.lg.ehu.es ([158.227.0.66]:51905 helo=smtp.ehu.eus) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jBNvy-0007O2-TV for qemu-devel@nongnu.org; Mon, 09 Mar 2020 15:19:27 -0400 Received: from imsva2.lgp.ehu.es (imsva2.lgp.ehu.es [10.0.3.246]) by postfix.smtp2.imsva2 (Postfix) with ESMTPS id CDCF35F6F; Mon, 9 Mar 2020 20:19:25 +0100 (CET) Received: from imsva2.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A734A5A04F; Mon, 9 Mar 2020 20:19:25 +0100 (CET) Received: from imsva2.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9BA365A045; Mon, 9 Mar 2020 20:19:25 +0100 (CET) Received: from smtp.ehu.eus (unknown [10.0.100.76]) by imsva2.lgp.ehu.es (Postfix) with ESMTPS; Mon, 9 Mar 2020 20:19:25 +0100 (CET) Received: from 669c1c222ef4 (static.187.0.0.81.ibercom.com [81.0.0.187]) by smtp2 (Postfix) with ESMTPSA id 588325F6F; Mon, 9 Mar 2020 20:19:25 +0100 (CET) Date: Mon, 9 Mar 2020 19:19:24 +0000 From: Unai Martinez-Corral To: qemu-devel@nongnu.org Subject: [PATCH v10 02/10] qemu-binfmt-conf.sh: enforce safe tests Message-ID: <20200309191924.GB65@669c1c222ef4> References: <20200309191200.GA60@669c1c222ef4> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200309191200.GA60@669c1c222ef4> X-Greylist: ACL 191 matched, not delayed by milter-greylist-4.6.2 (smtp2 [10.0.100.76]); Mon, 09 Mar 2020 20:19:25 +0100 (CET) X-TM-AS-GCONF: 00 X-TM-AS-Product-Ver: IMSVA-9.1.0.1631-8.5.0.1020-25280.002 X-TM-AS-Result: No-0.253-7.0-31-10 X-imss-scan-details: No-0.253-7.0-31-10 X-TMASE-Version: IMSVA-9.1.0.1631-8.5.1020-25280.002 X-TMASE-Result: 10-0.252900-10.000000 X-TMASE-MatchedRID: SUQ+NPRnbh2U2+gk9zFq8Wj+pATS/uaDab+ZPXqZNQIRGC0rW8q1XUhq QpzXZe40YNA0HZI8EiGPQi9XuOWoOA719kpOO37PlchF+IvkllOZ2scyRQcer0p12IXZajx5l5E fwglrgibcDDiLNFW0338mA3sDDq0A5MIx11wv+COujVRFkkVsm0r0NWqXwFtCiB5O0Sfffperyi 6SZSetV8cZ0J7yLqpqnjfVSwVbRsuIqhk2ZZ/hxF3P+KLVI//s3dLftEkjrnEl2KDtHVTYMlDwi PJ9vtHU1pHp569Iswjf5J+T5huzBH9c2E6+vBYDhCWCIvLE6iA= X-TMASE-SNAP-Result: 1.821001.0001-0-1-12:0,22:0,33:0,34:0-0 X-Greylist: Sender IP whitelisted, Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.6.2 (postfix.smtp2.imsva2 [10.0.100.76]); Mon, 09 Mar 2020 20:19:25 +0100 (CET) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 158.227.0.66 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: riku.voipio@iki.fi, laurent@vivier.eu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" All the tests are prefixed with 'x', in order to avoid risky comparisons (i.e. a user deliberately trying to provoke a syntax error). Signed-off-by: Unai Martinez-Corral Reviewed-by: Laurent Vivier Reviewed-by: Eric Blake --- scripts/qemu-binfmt-conf.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index c728443ba2..98401f4e7c 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -259,10 +259,10 @@ qemu_check_systemd() { =20 qemu_generate_register() { flags=3D"" - if [ "$CREDENTIAL" =3D "yes" ]; then + if [ "x$CREDENTIAL" =3D "xyes" ]; then flags=3D"OC" fi - if [ "$PERSISTENT" =3D "yes" ]; then + if [ "x$PERSISTENT" =3D "xyes" ]; then flags=3D"${flags}F" fi =20 @@ -300,18 +300,18 @@ qemu_set_binfmts() { mask=3D$(eval echo \$${cpu}_mask) family=3D$(eval echo \$${cpu}_family) =20 - if [ "$magic" =3D "" ] || [ "$mask" =3D "" ] || [ "$family" =3D ""= ]; then + if [ "x$magic" =3D "x" ] || [ "x$mask" =3D "x" ] || [ "x$family" = =3D "x" ]; then echo "INTERNAL ERROR: unknown cpu $cpu" 1>&2 continue fi =20 qemu=3D"$QEMU_PATH/qemu-$cpu" - if [ "$cpu" =3D "i486" ]; then + if [ "x$cpu" =3D "xi486" ]; then qemu=3D"$QEMU_PATH/qemu-i386" fi =20 qemu=3D"$qemu$QEMU_SUFFIX" - if [ "$host_family" !=3D "$family" ]; then + if [ "x$host_family" !=3D "x$family" ]; then $BINFMT_SET fi done --=20 2.25.1