Merge pull request #238 from slimm609/fix_duplicate_entries

fix: fix duplicate entries

.gitignore

@@ -1,3 +1,5 @@
 sign-checksec.sh
 checksec.crt
 checksec.key
+tests/binaries/output/
+dist/

Dockerfile.ubuntu

@@ -2,9 +2,9 @@ FROM ubuntu:22.04
 
 # Install dependencies
 RUN apt-get update && apt-get -y -q upgrade && DEBIAN_FRONTEND=noninteractive apt-get -y -q install \
-  bc bison flex build-essential ccache git file \
+  bc bison flex build-essential git file \
   libncurses-dev libssl-dev u-boot-tools wget \
-  xz-utils vim xfce4 libxml2-utils python3 python3-pip jq \
+  xz-utils vim libxml2-utils python3 python3-pip jq \
   gcc clang gcc-multilib && apt-get clean \
   pip3 install --upgrade pip && pip3 install setuptools && \
   pip3 install demjson3 && mkdir -p /zig && \

checksec

@@ -823,18 +823,29 @@ filecheck() {
   fi
 
   search_libc
-
+  libc_found="false"
+  if ${readelf} -d "${1}" 2> /dev/null | grep 'NEEDED' | grep -q 'libc\.so'; then
+    libc_found="true"
+  fi
   FS_filechk_func_libc="$(${readelf} -s "${use_dynamic}" "${FS_libc}" 2> /dev/null | sed -ne 's/.*__\(.*_chk\)@@.*/\1/p')"
   FS_func_libc="${FS_filechk_func_libc//_chk/}"
   FS_func="$(${readelf} -s "${use_dynamic}" "${1}" 2> /dev/null | awk '{ print $8 }' | sed -e 's/_*//' -e 's/@.*//' -e '/^$/d')"
-  FS_cnt_checked=$(grep -cFxf <(sort <<< "${FS_filechk_func_libc}") <(sort <<< "${FS_func}"))
-  FS_cnt_unchecked=$(grep -cFxf <(sort <<< "${FS_func_libc}") <(sort <<< "${FS_func}"))
+  FS_cnt_checked=$(grep -cFxf <(sort -u <<< "${FS_filechk_func_libc}") <(sort -u <<< "${FS_func}"))
+  FS_cnt_unchecked=$(grep -cFxf <(sort -u <<< "${FS_func_libc}") <(sort -u <<< "${FS_func}"))
   FS_cnt_total=$((FS_cnt_unchecked + FS_cnt_checked))
 
-  if [[ $FS_cnt_checked -eq $FS_cnt_total ]]; then
-    echo_message '\033[32mYes\033[m' 'Yes,' ' fortify_source="yes" ' '"fortify_source":"yes",'
+  if [[ "${libc_found}" == "false" ]] || [[ "${FS_cnt_total}" == "0" ]]; then
+    echo_message "\033[32mN/A\033[m" "N/A," ' fortify_source="n/a" ' '"fortify_source":"n/a",'
   else
-    echo_message "\033[31mNo\033[m" "No," ' fortify_source="no" ' '"fortify_source":"no",'
+    if [[ $FS_cnt_checked -eq $FS_cnt_total ]]; then
+      echo_message '\033[32mYes\033[m' 'Yes,' ' fortify_source="yes" ' '"fortify_source":"yes",'
+    else
+      if [[ "${FS_cnt_checked}" == "0" ]]; then
+        echo_message "\033[31mNo\033[m" "No," ' fortify_source="no" ' '"fortify_source":"no",'
+      else
+        echo_message "\033[33mPartial\033[m" "Partial," ' fortify_source="partial" ' '"fortify_source":"partial",'
+      fi
+    fi
   fi
   echo_message "\t${FS_cnt_checked}\t" "${FS_cnt_checked}", "fortified=\"${FS_cnt_checked}\" " "\"fortified\":\"${FS_cnt_checked}\","
   echo_message "\t${FS_cnt_total}\t\t" "${FS_cnt_total}" "fortify-able=\"${FS_cnt_total}\"" "\"fortify-able\":\"${FS_cnt_total}\""

kernel_configs/build_kernel_configs.sh

@@ -19,17 +19,17 @@ build_config() {
   fi
 }
 
-#build configs for 3.x up to 3.18
-for i in {1..18}; do
-  build_config 3.x 3 "$i"
-done
-
 #build configs for 4.x up to 4.19
 for i in {0..19}; do
   build_config 4.x 4 "$i"
 done
 
-#build configs for 5.x up to 5.10
-for i in {1..10}; do
+#build configs for 5.x up to 5.15
+for i in {1..15}; do
   build_config 5.x 5 "$i"
 done
+
+#build configs for 6.x up to 6.8
+for i in {1..8}; do
+  build_config 6.x 6 "$i"
+done