import CS kernel-srpm-macros-1.0-13.el9

SOURCES/find-provides.ksyms

@@ -3,6 +3,10 @@
 IFS=$'\n'
 export LC_ALL=C
 
+# Prevent elfutils from trying to download debuginfos
+unset DEBUGINFOD_URLS
+
+
 for module in $(grep -E '/lib/modules/.+\.ko(\.gz|\.bz2|\.xz|\.zst)?$') "$@"; do
     dep_pfx="ksym"
     # For built-in kmods, "kernel()" syntax is used instead of "ksym()"
@@ -34,36 +38,54 @@ for module in $(grep -E '/lib/modules/.+\.ko(\.gz|\.bz2|\.xz|\.zst)?$') "$@"; do
         module="$tmpfile"
     fi
 
-    if nm "$module" | grep -qE '^([0-9a-f]+) A __crc_(.+)' 2> /dev/null; then
+    # awk script return code:
-        nm "$module" \
+    #   0 - absolute __crc_* symbols have been found, output has been
-        | awk \
+    #       generated;
-           -v 'dep_pfx='"$dep_pfx" \
+    #   23 - a non-absolute __crc_* symbold has been found;
-           --non-decimal-data \
+    #   42 - no __crc_* symbols have been found.
-          'match($0, /^([0-9a-f]+) A __crc_(.+)/, a) { printf("%s(%s) = 0x%08x\n", dep_pfx, a[2], strtonum("0x" a[1])) }' \
+    nm "$module" \
-        | sort -u
+    | awk \
-    else
+       -v 'dep_pfx='"$dep_pfx" \
+       --non-decimal-data \
+       'BEGIN { exit_code = 42 }
+       match($0, /^([0-9a-f]+) (.) __crc_(.+)/, a) {
+           if (a[2] == "A") {
+               printf("%s(%s) = 0x%08x\n", dep_pfx, a[3], strtonum("0x" a[1]));
+               exit_code = 0;
+           } else {
+               exit_code = 23;
+               exit;
+           }
+       }
+       END { exit exit_code }'
+
+    [ 23 = "$?" ] && {
+        kmod_elf_hdr="$(readelf -h "$module")"
+        [ "x$kmod_elf_hdr" = "x${kmod_elf_hdr%Data:*little endian*}" ]
+        revbytes="$?"
+
         objdump -t "$module" \
-        | sed -n 's/^[0-9a-f][0-9a-f]* g...... \(.*\)	[0-9a-f][0-9a-f]* __crc_.*$/\1/p' \
+        | awk \
-        | sort -u \
+          -v 'dep_pfx='"$dep_pfx" \
-        | while read sectname; do
+          -v 'module='"$module" \
-            [ -n "$sectname" ] || continue
+          -v 'revbytes='"$revbytes" \
+          --non-decimal-data \
+          'function readsect(name,   a, t) {
+              a = "";
+              while (("readelf -R \"" name "\" \"" module "\"" | getline t) > 0) {
+                  if (match(t, /^  0x[0-9a-f]{8}/))
+                      a = a substr(t, 14, 8) substr(t, 23, 8) substr(t, 32, 8) substr(t, 41, 8);
+              }
+              if (revbytes) { a = gensub(/(..)(..)(..)(..)/, "\\4\\3\\2\\1", "g", a); }
+              sectdata[name] = a;
+          }
 
-            ELFSECTDATA=$(readelf -R "$sectname" "$module" | awk '/0x/{printf $2$3$4$5}')
+          match($0, /^([0-9a-f]+) [gl]...... (.*)	[0-9a-f]+ __crc_(.*)$/, a) {
-            if [[ -n $(readelf -h $module | grep "little endian") ]]; then
+              if (!(a[2] in sectdata)) { readsect(a[2]) }
-                SECTDATA=$(echo $ELFSECTDATA | sed 's/\(..\)\(..\)\(..\)\(..\)/\4\3\2\1/g')
+              printf("%s(%s) = 0x%08s\n", dep_pfx, a[3], substr(sectdata[a[2]], (strtonum("0x" a[1]) * 2) + 1, 8))
-            else
+          }'
-                SECTDATA=$ELFSECTDATA
+    }
-            fi
-
-            objdump -t "$module" \
-            | awk \
-              -v 'dep_pfx='"$dep_pfx" \
-              -v 'sectdata='"$SECTDATA" \
-              --non-decimal-data \
-              'match($0, /^([0-9a-f]+) g...... .*	[0-9a-f]+ __crc_(.*)$/, a) { printf("%s(%s) = 0x%08s\n", dep_pfx, a[2], substr(sectdata, (strtonum("0x" a[1]) * 2) + 1, 8)) }'
-        done \
-        | sort -u
-    fi
 
     [ -z "$tmpfile" ] || rm -f -- "$tmpfile"
-done
+done \
+| sort -k1,1 -u

SOURCES/find-requires.ksyms

@@ -6,6 +6,11 @@
 # provided by an external module and "ksym" replaces th regular "kernel" dep.
 
 IFS=$'\n'
+export LC_ALL=C
+
+# Prevent elfutils from trying to download debuginfos
+unset DEBUGINFOD_URLS
+
 
 # Extract all of the symbols provided by this module.
 all_provides() {
@@ -35,38 +40,57 @@ all_provides() {
             module="$tmpfile"
         fi
 
-        if nm "$module" | grep -qE '^([0-9a-f]+) A __crc_(.+)' 2> /dev/null; then
+        # awk script return code:
-            nm "$module" \
+        #   0 - absolute __crc_* symbols have been found, output has been
-            | awk \
+        #       generated;
-               -v 'dep_pfx='"$dep_pfx" \
+        #   23 - a non-absolute __crc_* symbold has been found;
-               --non-decimal-data \
+        #   42 - no __crc_* symbols have been found.
-              'match($0, /^([0-9a-f]+) A __crc_(.+)/, a) { printf("%s(%s) = 0x%08x\n", dep_pfx, a[2], strtonum("0x" a[1])) }'
+        nm "$module" \
-        else
+        | awk \
+           -v 'dep_pfx='"$dep_pfx" \
+           --non-decimal-data \
+           'BEGIN { exit_code = 42 }
+           match($0, /^([0-9a-f]+) (.) __crc_(.+)/, a) {
+               if (a[2] == "A") {
+                   printf("%s(%s) = 0x%08x\n", dep_pfx, a[3], strtonum("0x" a[1]));
+                   exit_code = 0;
+               } else {
+                   exit_code = 23;
+                   exit;
+               }
+           }
+           END { exit exit_code }'
+
+        [ 23 = "$?" ] && {
+            kmod_elf_hdr="$(readelf -h "$module")"
+            [ "x$kmod_elf_hdr" = "x${kmod_elf_hdr%Data:*little endian*}" ]
+            revbytes="$?"
+
             objdump -t "$module" \
-            | sed -n 's/^[0-9a-f][0-9a-f]* g...... \(.*\)	[0-9a-f][0-9a-f]* __crc_.*$/\1/p' \
+            | awk \
-            | sort -u \
+              -v 'dep_pfx='"$dep_pfx" \
-            | while read sectname; do
+              -v 'module='"$module" \
-                [ -n "$sectname" ] || continue
+              -v 'revbytes='"$revbytes" \
+              --non-decimal-data \
+              'function readsect(name,   a, t) {
+                  a = "";
+                  while (("readelf -R \"" name "\" \"" module "\"" | getline t) > 0) {
+                      if (match(t, /^  0x[0-9a-f]{8}/))
+                          a = a substr(t, 14, 8) substr(t, 23, 8) substr(t, 32, 8) substr(t, 41, 8);
+                  }
+                  if (revbytes) { a = gensub(/(..)(..)(..)(..)/, "\\4\\3\\2\\1", "g", a); }
+                  sectdata[name] = a;
+              }
 
-                ELFSECTDATA=$(readelf -R .rodata "$module" | awk '/0x/{printf $2$3$4$5}')
+              match($0, /^([0-9a-f]+) [gl]...... (.*)	[0-9a-f]+ __crc_(.*)$/, a) {
-                if [[ -n $(readelf -h "$module" | grep "little endian") ]]; then
+                  if (!(a[2] in sectdata)) { readsect(a[2]) }
-                    SECTDATA=$(echo $ELFSECTDATA | sed 's/\(..\)\(..\)\(..\)\(..\)/\4\3\2\1/g')
+                  printf("%s(%s) = 0x%08s\n", dep_pfx, a[3], substr(sectdata[a[2]], (strtonum("0x" a[1]) * 2) + 1, 8))
-                else
+              }'
-                    SECTDATA=$ELFSECTDATA
+        }
-                fi
-
-                objdump -t "$module" \
-                | awk \
-                  -v 'dep_pfx='"$dep_pfx" \
-                  -v 'sectdata='"$SECTDATA" \
-                  --non-decimal-data \
-                  'match($0, /^([0-9a-f]+) g...... .*	[0-9a-f]+ __crc_(.*)$/, a) { printf("%s(%s) = 0x%08s\n", dep_pfx, a[2], substr(sectdata, (strtonum("0x" a[1]) * 2) + 1, 8)) }'
-            done
-        fi
 
         [ -z "$tmpfile" ] || rm -f -- "$tmpfile"
     done \
-    | LC_ALL=C sort -k1,1 -u
+    | sort -k1,1 -u
 }
 
 # Extract all of the requirements of this module.
@@ -79,15 +103,15 @@ all_requires() {
             {printf("%s:0x%08x\n", $2, $1)}' \
         | sed -r -e 's:$:\t'"$1"':'
     done \
-    | LC_ALL=C sort -k1,1 -u
+    | sort -k1,1 -u
 }
 
 # Filter out requirements fulfilled by the module itself.
 mod_requires() {
-    LC_ALL=C join -t $'\t' -j 1 -v 1 \
+    join -t $'\t' -j 1 -v 1 \
         <(all_requires "$@") \
         <(all_provides "$@") \
-    | LC_ALL=C sort -k1,1 -u
+    | sort -k1,1 -u
 }
 
 if ! [ -e /sbin/modinfo -a -e /sbin/modprobe ]; then
@@ -150,21 +174,21 @@ if [ ${#modules[@]} -gt 0 ]; then
         { print $2 ":" $1 }
     ' \
     | sed -r -e 's:$:\t'"$kernel"':' \
-    | LC_ALL=C sort -k1,1 -u > $symvers
+    | sort -k1,1 -u > $symvers
 
     # Symbols matching with the kernel get a "kernel" dependency
     mod_req=$(mktemp -t mod_req.XXXXX)
     mod_requires "${modules[@]}" > "$mod_req"
-    LC_ALL=C join -t $'\t' -j 1 $symvers "$mod_req" | LC_ALL=C sort -u \
+    join -t $'\t' -j 1 $symvers "$mod_req" | sort -u \
     | awk 'BEGIN { FS = "[\t:]" ; OFS = "\t" } { print "kernel(" $1 ") = " $2 }'
 
     # Symbols from elsewhere get a "ksym" dependency
-    LC_ALL=C join -t $'\t' -j 1 -v 2 $symvers "$mod_req" | LC_ALL=C sort -u \
+    join -t $'\t' -j 1 -v 2 $symvers "$mod_req" | sort -u \
     | awk 'BEGIN { FS = "[\t:]" ; OFS = "\t" } { print "ksym(" $1 ") = " $2 }'
 
     # Check kABI if the kabi-stablelists package is installed
     # Do this last so we can try to output this error at the end
-    kabi_check_symbols=($(LC_ALL=C join -t $'\t' -j 1 $symvers "$mod_req" | LC_ALL=C sort -u \
+    kabi_check_symbols=($(join -t $'\t' -j 1 $symvers "$mod_req" | sort -u \
     | awk 'BEGIN { FS = "[\t:]" ; OFS = "\t" } { print $1 }'))
     check_kabi "${kabi_check_symbols[@]}"
 fi

SOURCES/kabi.attr

@@ -1,2 +1,2 @@
 %__kabi_provides	%{_rpmconfigdir}/kabi.sh
-%__kabi_path            ^(/boot/symvers-.*|/lib/modules/[1-9].*/symvers)\.gz$
+%__kabi_path            ^(/boot/symvers-.*|/lib/modules/[1-9].*/symvers)\.(gz|xz)$

SOURCES/kabi.sh

@@ -7,10 +7,16 @@
 
 IFS=$'\n'
 
-for symvers in $(grep -E '(/boot/symvers-.*|/lib/modules/[1-9].*/symvers)\.gz') "$@";
+for symvers in $(grep -E '(/boot/symvers-.*|/lib/modules/[1-9].*/symvers)\.(gz|xz)') "$@";
 do
+	cat_prog="cat"
+	case "$symvers" in
+	*.gz) cat_prog="zcat" ;;
+	*.xz) cat_prog="xzcat" ;;
+	esac
+
 	# We generate dependencies only for symbols exported by vmlinux itself
 	# and not for kmods here as they are spread across subpackages,
 	# so Provides: generation for kmods is handled by find-provides.ksyms.
-	zcat $symvers | awk '/[^	]*	[^	]*	vmlinux	.*/ { print "kernel(" $2 ") = " $1 }'
+	"$cat_prog" "$symvers" | awk '/[^	]*	[^	]*	vmlinux	.*/ { print "kernel(" $2 ") = " $1 }'
 done

SPECS/kernel-srpm-macros.spec

@@ -1,6 +1,6 @@
 Name:           kernel-srpm-macros
 Version:        1.0
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        RPM macros that list arches the full kernel is built on
 # This package only exist in Fedora repositories
 # The license is the standard (MIT) specified in
@@ -134,6 +134,20 @@ install -p -m 644 -t "%{buildroot}%{_fileattrsdir}" modalias.attr
 %{rrcdir}/find-provides.d/modalias.prov
 
 %changelog
+* Mon Jun 12 2023 Eugene Syromiatnikov <esyr@redhat.com> - 1.0-13
+- Handle symvers.xz in kabi.attr (#2209253).
+- Fix indirect __crc_* sumbols parsing in find-provides.ksyms
+  and find-requires.ksyms to avoid matching multiple sections
+  producing bogus duplicate provides for kmods that have both __kcrctab
+  and __kcrctab_gpl sections (#2115811, #2178935).
+- Call "readelf -R" on a correct section in find-requires.ksyms.
+- Rewrite section data extraction in find-provides.ksyms and find-requires.ksyms
+  to avoid garbage at the end of extracted sections, causing unnecessary awk
+  complaints (#2115811).
+- Perform section parsing inside the awk script in find-provides.ksyms
+  and find-requires.ksyms to avoid hitting command line argument limit
+  when handling large .rodata sections (#2178935).
+
 * Tue Jan 31 2023 Eugene Syromiatnikov <esyr@redhat.com> - 1.0-12
 - Support storing of __crc_* symbols in sections other than .rodata.
 - Resolves: #2135047