24312e21be
Commit binutils-2_33~1385[1] has changed (and binutils-2_35~1768[2] has not reverted) the calculated type for symbols in read-write .rodata section from 'R' to 'D' on architectures where CONFIG_MODULE_REL_CRCS is enabled (namely, ppc64* and s390*), since, apparently, many kernel modules have it indeed read-write. Work around it by matching both D and R as possible __crc_* symbol type. [1] https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=a288c270991d [2] https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=49d9fd42acef * find-provides.ksyms: Match D as possible __crc_* symbol type in addition to R. * find-requires.ksyms: Likewise. * kernel-srpm-macros.spec (Release): Bump to 11%{?dist}. (%changelog): Mention the change. Resolves: #2055464 Signed-off-by: Eugene Syromiatnikov <esyr@redhat.com>
64 lines
2.2 KiB
Bash
Executable File
64 lines
2.2 KiB
Bash
Executable File
#! /bin/bash
|
|
|
|
IFS=$'\n'
|
|
|
|
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()"
|
|
printf "%s" "$module" | grep -v "^${RPM_BUILD_ROOT}/\?lib/modules/[1-9][^/]*/kernel" > /dev/null \
|
|
|| dep_pfx="kernel"
|
|
|
|
tmpfile=""
|
|
if [ "x${module%.ko}" = "x${module}" ]; then
|
|
tmpfile=$(mktemp -t ${0##*/}.XXXXXX.ko)
|
|
proc_bin=
|
|
case "${module##*.}" in
|
|
zst)
|
|
proc_bin=zstd
|
|
;;
|
|
xz)
|
|
proc_bin=xz
|
|
;;
|
|
bz2)
|
|
proc_bin=bzip2
|
|
;;
|
|
gz)
|
|
proc_bin=gzip
|
|
;;
|
|
esac
|
|
|
|
[ -n "$proc_bin" ] || continue
|
|
|
|
"$proc_bin" -d -c - < "$module" > "$tmpfile" || continue
|
|
module="$tmpfile"
|
|
fi
|
|
|
|
if [[ -n $(nm $module | sed -r -ne 's:^0*([0-9a-f]+) A __crc_(.+):0x\1 \2:p') ]]; then
|
|
nm $module \
|
|
| sed -r -ne 's:^0*([0-9a-f]+) A __crc_(.+):0x\1 \2:p' \
|
|
| awk --non-decimal-data '{printf("'"${dep_pfx}"'(%s) = 0x%08x\n", $2, $1)}' \
|
|
| LC_ALL=C sort -u
|
|
else
|
|
ELFRODATA=$(readelf -R .rodata $module | awk '/0x/{printf $2$3$4$5}')
|
|
if [[ -n $(readelf -h $module | grep "little endian") ]]; then
|
|
RODATA=$(echo $ELFRODATA | sed 's/\(..\)\(..\)\(..\)\(..\)/\4\3\2\1/g')
|
|
else
|
|
RODATA=$ELFRODATA
|
|
fi
|
|
# Commit binutils-2_33~1385[1] has changed (and binutils-2_35~1768[2]
|
|
# has not reverted it) the calculated type for symbols in read-write
|
|
# .rodata section from 'R' to 'D', since, apparently, many kernel
|
|
# modules have it indeed read-write.
|
|
#
|
|
# [1] https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=a288c270991d
|
|
# [2] https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=49d9fd42acef
|
|
for sym in $(nm $module | sed -r -ne 's:^0*([0-9a-f]+) [DR] __crc_(.+):0x\1 \2:p'); do
|
|
echo $sym $RODATA
|
|
done \
|
|
| awk --non-decimal-data '{printf("'"${dep_pfx}"'(%s) = 0x%08s\n", $2, substr($3,($1*2)+1,8))}' \
|
|
| LC_ALL=C sort -u
|
|
fi
|
|
|
|
[ -z "$tmpfile" ] || rm -f -- "$tmpfile"
|
|
done
|