[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v10 02/10] qemu-binfmt-conf.sh: enforce safe tests
From: |
Unai Martinez-Corral |
Subject: |
[PATCH v10 02/10] qemu-binfmt-conf.sh: enforce safe tests |
Date: |
Mon, 9 Mar 2020 19:19:24 +0000 |
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 <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
---
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() {
qemu_generate_register() {
flags=""
- if [ "$CREDENTIAL" = "yes" ]; then
+ if [ "x$CREDENTIAL" = "xyes" ]; then
flags="OC"
fi
- if [ "$PERSISTENT" = "yes" ]; then
+ if [ "x$PERSISTENT" = "xyes" ]; then
flags="${flags}F"
fi
@@ -300,18 +300,18 @@ qemu_set_binfmts() {
mask=$(eval echo \$${cpu}_mask)
family=$(eval echo \$${cpu}_family)
- if [ "$magic" = "" ] || [ "$mask" = "" ] || [ "$family" = "" ]; then
+ if [ "x$magic" = "x" ] || [ "x$mask" = "x" ] || [ "x$family" = "x" ];
then
echo "INTERNAL ERROR: unknown cpu $cpu" 1>&2
continue
fi
qemu="$QEMU_PATH/qemu-$cpu"
- if [ "$cpu" = "i486" ]; then
+ if [ "x$cpu" = "xi486" ]; then
qemu="$QEMU_PATH/qemu-i386"
fi
qemu="$qemu$QEMU_SUFFIX"
- if [ "$host_family" != "$family" ]; then
+ if [ "x$host_family" != "x$family" ]; then
$BINFMT_SET
fi
done
--
2.25.1
[PATCH v10 03/10] qemu-binfmt-conf.sh: make opts -p and -c boolean, Unai Martinez-Corral, 2020/03/09
[PATCH v10 04/10] qemu-binfmt-conf.sh: add QEMU_CREDENTIAL and QEMU_PERSISTENT, Unai Martinez-Corral, 2020/03/09
[PATCH v10 05/10] qemu-binfmt-conf.sh: use the same presentation format as for qemu-*, Unai Martinez-Corral, 2020/03/09
[PATCH v10 06/10] qemu-binfmt-conf.sh: remove 'qemu' prefix from cli options, Unai Martinez-Corral, 2020/03/09