linux-kernel - [tip:x86/urgent] x86/syscalls: Remove bash-isms in syscall table generator

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-2df0e78b44e2cbbaa1e319cbca34f23599a4daa0@git.kernel.org>
Date:   Wed, 5 Oct 2016 02:48:58 -0700
From:   "tip-bot for sylvain.bertrand@...il.com" <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     mingo@...nel.org, linux-kernel@...r.kernel.org, tglx@...utronix.de,
        hpa@...or.com, sylvain.bertrand@...il.com
Subject: [tip:x86/urgent] x86/syscalls: Remove bash-isms in syscall table
 generator

Commit-ID:  2df0e78b44e2cbbaa1e319cbca34f23599a4daa0
Gitweb:     http://git.kernel.org/tip/2df0e78b44e2cbbaa1e319cbca34f23599a4daa0
Author:     sylvain.bertrand@...il.com <sylvain.bertrand@...il.com>
AuthorDate: Thu, 29 Sep 2016 16:22:34 +0000
Committer:  Thomas Gleixner <tglx@...utronix.de>
CommitDate: Wed, 5 Oct 2016 11:34:25 +0200

x86/syscalls: Remove bash-isms in syscall table generator

Signed-off-by: Sylvain BERTRAND <sylvain.bertrand@...il.com>
Link: http://lkml.kernel.org/r/20160929162234.GA29592@freedom
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>

---
 arch/x86/entry/syscalls/syscalltbl.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/arch/x86/entry/syscalls/syscalltbl.sh b/arch/x86/entry/syscalls/syscalltbl.sh
index cd3d301..751d1f9 100644
--- a/arch/x86/entry/syscalls/syscalltbl.sh
+++ b/arch/x86/entry/syscalls/syscalltbl.sh
@@ -10,8 +10,11 @@ syscall_macro() {
 
     # Entry can be either just a function name or "function/qualifier"
     real_entry="${entry%%/*}"
-    qualifier="${entry:${#real_entry}}"		# Strip the function name
-    qualifier="${qualifier:1}"			# Strip the slash, if any
+    if [ "$entry" = "$real_entry" ]; then
+        qualifier=
+    else
+        qualifier=${entry#*/}
+    fi
 
     echo "__SYSCALL_${abi}($nr, $real_entry, $qualifier)"
 }
@@ -22,7 +25,7 @@ emit() {
     entry="$3"
     compat="$4"
 
-    if [ "$abi" == "64" -a -n "$compat" ]; then
+    if [ "$abi" = "64" -a -n "$compat" ]; then
 	echo "a compat entry for a 64-bit syscall makes no sense" >&2
 	exit 1
     fi
@@ -45,17 +48,17 @@ emit() {
 grep '^[0-9]' "$in" | sort -n | (
     while read nr abi name entry compat; do
 	abi=`echo "$abi" | tr '[a-z]' '[A-Z]'`
-	if [ "$abi" == "COMMON" -o "$abi" == "64" ]; then
+	if [ "$abi" = "COMMON" -o "$abi" = "64" ]; then
 	    # COMMON is the same as 64, except that we don't expect X32
 	    # programs to use it.  Our expectation has nothing to do with
 	    # any generated code, so treat them the same.
 	    emit 64 "$nr" "$entry" "$compat"
-	elif [ "$abi" == "X32" ]; then
+	elif [ "$abi" = "X32" ]; then
 	    # X32 is equivalent to 64 on an X32-compatible kernel.
 	    echo "#ifdef CONFIG_X86_X32_ABI"
 	    emit 64 "$nr" "$entry" "$compat"
 	    echo "#endif"
-	elif [ "$abi" == "I386" ]; then
+	elif [ "$abi" = "I386" ]; then
 	    emit "$abi" "$nr" "$entry" "$compat"
 	else
 	    echo "Unknown abi $abi" >&2