Merge branch 'master' of github.com:diego-treitos/linux-smart-enumera…

…tion
diego-treitos · Apr 3, 2022 · f8d578c · f8d578c
2 parents 4c82e99 + 8f0836a
commit f8d578c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/cve/cve-2022-0847.sh b/cve/cve-2022-0847.sh
@@ -53,9 +53,9 @@ lse_cve_test() { #(
 
   if [ "$v1" = 5 ]; then
     if [ $((v2)) -lt 8 ] ||
-      [ "$v2" = 10 ] && [ $((v3)) -ge 102 ] ||
-      [ "$v2" = 15 ] && [ $((v3)) -ge 25 ] ||
-      [ "$v2" = 16 ] && [ $((v3)) -ge 11 ] ||
+      { [ "$v2" = 10 ] && [ $((v3)) -ge 102 ]; } ||
+      { [ "$v2" = 15 ] && [ $((v3)) -ge 25 ]; } ||
+      { [ "$v2" = 16 ] && [ $((v3)) -ge 11 ]; } ||
       [ $((v2)) -gt 16 ]
     then
         # Not vulnerable

diff --git a/lse.sh b/lse.sh
@@ -1467,14 +1467,18 @@ lse_run_tests_processes() {
 #########################################################################( CVEs
 lse_run_tests_cves() {
   lse_header "cve" "CVEs"
+  if [ "${#lse_cve_list}" = 1 ]; then
+    echo "In order to test for CVEs, download lse.sh from the GitHub releases page."
+    echo "Alternatively, build lse_cve.sh using tools/package_cvs_into_lse.sh from the repository."
+  else
+    for lse_cve in $lse_cve_list; do
+      eval "$(printf '%s' "$lse_cve" | base64 -d | gunzip -c)"
 
-  for lse_cve in $lse_cve_list; do
-    eval "$(printf '%s' "$lse_cve" | base64 -d | gunzip -c)"
-
-    lse_test "$lse_cve_id" "$lse_cve_level" \
-      "$lse_cve_description" \
-      "lse_cve_test"
-  done
+      lse_test "$lse_cve_id" "$lse_cve_level" \
+        "$lse_cve_description" \
+        "lse_cve_test"
+    done
+  fi
 }
 #)
 #