fb5e29ef17
* Mon Apr 11 2022 Patrick Talbert <ptalbert@redhat.com> [5.14.0-78.el9] - CI: Remove deprecated option (Veronika Kabatova) - scsi: iscsi: Fix nop handling during conn recovery (Chris Leech) [2069973] - scsi: iscsi: Merge suspend fields (Chris Leech) [2069973] - scsi: iscsi: Fix offload conn cleanup when iscsid restarts (Chris Leech) [2069973] - scsi: iscsi: Move iscsi_ep_disconnect (Chris Leech) [2069973] - NFS: Don't loop forever in nfs_do_recoalesce() (Steve Dickson) [2069274] - perf/x86/intel/uncore: Make uncore_discovery clean for 64 bit addresses (Michael Petlan) [2069686] - KVM: SVM: Allow AVIC support on system w/ physical APIC ID > 255 (Bandan Das) [2033070] - iommu/amd: Fix I/O page table memory leak (Jerry Snitselaar) [2053219] - iommu/amd: Recover from event log overflow (Jerry Snitselaar) [2053219] - redhat/configs: drop some config options for rhel 9. (David Airlie) [2067027] - arm64: proton-pack: Include unprivileged eBPF status in Spectre v2 mitigation reporting (Waiman Long) [2062288] {CVE-2022-23960} - arm64: Use the clearbhb instruction in mitigations (Waiman Long) [2062288] {CVE-2022-23960} - KVM: arm64: Allow SMCCC_ARCH_WORKAROUND_3 to be discovered and migrated (Waiman Long) [2062288] {CVE-2022-23960} - arm64: Mitigate spectre style branch history side channels (Waiman Long) [2062288] {CVE-2022-23960} - arm64: proton-pack: Report Spectre-BHB vulnerabilities as part of Spectre-v2 (Waiman Long) [2062288] {CVE-2022-23960} - arm64: Add percpu vectors for EL1 (Waiman Long) [2062288] {CVE-2022-23960} - arm64: entry: Add macro for reading symbol addresses from the trampoline (Waiman Long) [2062288] {CVE-2022-23960} - arm64: entry: Add vectors that have the bhb mitigation sequences (Waiman Long) [2062288] {CVE-2022-23960} - arm64: entry: Add non-kpti __bp_harden_el1_vectors for mitigations (Waiman Long) [2062288] {CVE-2022-23960} - arm64: entry: Allow the trampoline text to occupy multiple pages (Waiman Long) [2062288] {CVE-2022-23960} - arm64: entry: Make the kpti trampoline's kpti sequence optional (Waiman Long) [2062288] {CVE-2022-23960} - arm64: entry: Move trampoline macros out of ifdef'd section (Waiman Long) [2062288] {CVE-2022-23960} - arm64: entry: Don't assume tramp_vectors is the start of the vectors (Waiman Long) [2062288] {CVE-2022-23960} - arm64: entry: Allow tramp_alias to access symbols after the 4K boundary (Waiman Long) [2062288] {CVE-2022-23960} - arm64: entry: Move the trampoline data page before the text page (Waiman Long) [2062288] {CVE-2022-23960} - arm64: entry: Free up another register on kpti's tramp_exit path (Waiman Long) [2062288] {CVE-2022-23960} - arm64: entry: Make the trampoline cleanup optional (Waiman Long) [2062288] {CVE-2022-23960} - KVM: arm64: Allow indirect vectors to be used without SPECTRE_V3A (Waiman Long) [2062288] {CVE-2022-23960} - arm64: spectre: Rename spectre_v4_patch_fw_mitigation_conduit (Waiman Long) [2062288] {CVE-2022-23960} - arm64: entry.S: Add ventry overflow sanity checks (Waiman Long) [2062288] {CVE-2022-23960} - arm64: Add Cortex-A510 CPU part definition (Waiman Long) [2062288] {CVE-2022-23960} - arm64: Add Cortex-X2 CPU part definition (Waiman Long) [2062288] {CVE-2022-23960} - arm64: cpufeature: add HWCAP for FEAT_RPRES (Waiman Long) [2062288] {CVE-2022-23960} - arm64: add ID_AA64ISAR2_EL1 sys register (Waiman Long) [2062288] {CVE-2022-23960} - arm64: cpufeature: add HWCAP for FEAT_AFP (Waiman Long) [2062288] {CVE-2022-23960} - arm64: Add Neoverse-N2, Cortex-A710 CPU part definition (Waiman Long) [2062288] {CVE-2022-23960} - arm64: Add HWCAP for self-synchronising virtual counter (Waiman Long) [2062288] {CVE-2022-23960} - iommu/vt-d: Fix double list_add when enabling VMD in scalable mode (Jerry Snitselaar) [2061621] - redhat/configs: remove unnecessary GPIO options for aarch64 (Brian Masney) [2060951] - redhat/configs: remove viperboard related Kconfig options (Brian Masney) [2060951] - configs: enable CONFIG_RMI4_F3A (Benjamin Tissoires) [2067243] - block: release rq qos structures for queue without disk (Ming Lei) [2065610] - fuse: fix pipe buffer lifetime for direct_io (Miklos Szeredi) [2064862] {CVE-2022-1011} - crypto: hmac - disallow keys < 112 bits in FIPS mode (Herbert Xu) [2033512] - crypto: hmac - add fips_skip support (Herbert Xu) [2033512] - crypto: des - disallow des3 in FIPS mode (Herbert Xu) [2033512] - crypto: dh - limit key size to 2048 in FIPS mode (Herbert Xu) [2033512] - crypto: rsa - limit key size to 2048 in FIPS mode (Herbert Xu) [2033512] - watch_queue: Make comment about setting ->defunct more accurate (David Howells) [2063758] - watch_queue: Fix lack of barrier/sync/lock between post and read (David Howells) [2063758] - watch_queue: Free the alloc bitmap when the watch_queue is torn down (David Howells) [2063758] - watch_queue: Fix the alloc bitmap size to reflect notes allocated (David Howells) [2063758] - watch_queue: Use the bitmap API when applicable (David Howells) [2063758] - watch_queue: Fix to always request a pow-of-2 pipe ring size (David Howells) [2063758] - watch_queue: Fix to release page in ->release() (David Howells) [2063758] - watch_queue, pipe: Free watchqueue state after clearing pipe ring (David Howells) [2063758] - watch_queue: Fix filter limit check (David Howells) [2063758] {CVE-2022-0995} - s390/mm: check 2KB-fragment page on release (Rafael Aquini) [2069978] - s390/mm: better annotate 2KB pagetable fragments handling (Rafael Aquini) [2069978] - s390/mm: fix 2KB pgtable release race (Rafael Aquini) [2069978] - ima: fix deadlock when traversing "ima_default_rules". (Bruno Meneguele) [2063913] - IMA: prevent SETXATTR_CHECK policy rules with unavailable algorithms (Bruno Meneguele) [2063913] - IMA: introduce a new policy option func=SETXATTR_CHECK (Bruno Meneguele) [2063913] - IMA: add a policy option to restrict xattr hash algorithms on appraisal (Bruno Meneguele) [2063913] - IMA: add support to restrict the hash algorithms used for file appraisal (Bruno Meneguele) [2063913] - IMA: block writes of the security.ima xattr with unsupported algorithms (Bruno Meneguele) [2063913] - IMA: remove the dependency on CRYPTO_MD5 (Bruno Meneguele) [2063913] - perf symbols: Fix symbol size calculation condition (Michael Petlan) [2049222] - redhat/Makefile: Fix dist-dump-variables target (Prarit Bhargava) - redhat/configs/process_configs.sh: Avoid race with find (Prarit Bhargava) - redhat/configs/process_configs.sh: Remove CONTINUEONERROR (Prarit Bhargava) - redhat/configs/process_configs.sh: Fix race with tools generation (Prarit Bhargava) - redhat/Makefile: Silence dist-clean-configs output (Prarit Bhargava) - Print arch with process_configs errors (Prarit Bhargava) - Pass RHJOBS to process_configs for dist-configs-check as well (Prarit Bhargava) - redhat/configs/process_configs.sh: Fix issue with old error files (Prarit Bhargava) - redhat/configs/build_configs.sh: Parallelize execution (Prarit Bhargava) - redhat/configs/build_configs.sh: Provide better messages (Prarit Bhargava) - redhat/configs/build_configs.sh: Create unique output files (Prarit Bhargava) - redhat/configs/build_configs.sh: Add local variables (Prarit Bhargava) - redhat/configs/process_configs.sh: Parallelize execution (Prarit Bhargava) - redhat/configs/process_configs.sh: Provide better messages (Prarit Bhargava) - redhat/configs/process_configs.sh: Create unique output files (Prarit Bhargava) - redhat/configs/process_configs.sh: Add processing config function (Prarit Bhargava) - cifs: modefromsids must add an ACE for authenticated users (Ronnie Sahlberg) [1988278] Resolves: rhbz#1988278, rhbz#2049222, rhbz#2063913, rhbz#2069978 Signed-off-by: Patrick Talbert <ptalbert@redhat.com>
409 lines
9.9 KiB
Bash
Executable File
409 lines
9.9 KiB
Bash
Executable File
#!/bin/bash
|
|
#
|
|
# This script takes the merged config files and processes them through oldconfig
|
|
# and listnewconfig
|
|
#
|
|
# Globally disable suggestion of appending '|| exit' or '|| return' to cd/pushd/popd commands
|
|
# shellcheck disable=SC2164
|
|
|
|
usage()
|
|
{
|
|
# alphabetical order please
|
|
echo "process_configs.sh [ options ] package_name kernel_version"
|
|
echo " -a: report all errors, equivalent to [-c -n -w -i]"
|
|
echo " -c: error on mismatched config options"
|
|
echo " -i: continue on error"
|
|
echo " -n: error on unset config options"
|
|
echo " -t: test run, do not overwrite original config"
|
|
echo " -w: error on misconfigured config options"
|
|
echo " -z: commit new configs to pending directory"
|
|
echo ""
|
|
echo " A special CONFIG file tag, process_configs_known_broken can be added as a"
|
|
echo " comment to any CONFIG file. This tag indicates that there is no way to "
|
|
echo " fix a CONFIG's entry. This tag should only be used in extreme cases"
|
|
echo " and is not to be used as a workaround to solve CONFIG problems."
|
|
exit 1
|
|
}
|
|
|
|
die()
|
|
{
|
|
echo "$1"
|
|
exit 1
|
|
}
|
|
|
|
get_cross_compile()
|
|
{
|
|
arch=$1
|
|
if [[ "$CC_IS_CLANG" -eq 1 ]]; then
|
|
echo "$arch"
|
|
else
|
|
echo "scripts/dummy-tools/"
|
|
fi
|
|
}
|
|
|
|
# stupid function to find top of tree to do kernel make configs
|
|
switch_to_toplevel()
|
|
{
|
|
path="$(pwd)"
|
|
while test -n "$path"
|
|
do
|
|
test -e "$path"/MAINTAINERS && \
|
|
test -d "$path"/drivers && \
|
|
break
|
|
|
|
path=$(dirname "$path")
|
|
done
|
|
|
|
test -n "$path" || die "Can't find toplevel"
|
|
echo "$path"
|
|
}
|
|
|
|
checkoptions()
|
|
{
|
|
count=$3
|
|
variant=$4
|
|
|
|
/usr/bin/awk '
|
|
|
|
/is not set/ {
|
|
split ($0, a, "#");
|
|
split(a[2], b);
|
|
if (NR==FNR) {
|
|
configs[b[1]]="is not set";
|
|
} else {
|
|
if (configs[b[1]] != "" && configs[b[1]] != "is not set")
|
|
print "Found # "b[1] " is not set, after generation, had " b[1] " " configs[b[1]] " in Source tree";
|
|
}
|
|
}
|
|
|
|
/=/ {
|
|
split ($0, a, "=");
|
|
if (NR==FNR) {
|
|
configs[a[1]]=a[2];
|
|
} else {
|
|
if (configs[a[1]] != "" && configs[a[1]] != a[2])
|
|
print "Found "a[1]"="a[2]" after generation, had " a[1]"="configs[a[1]]" in Source tree";
|
|
}
|
|
}
|
|
' "$1" "$2" > .mismatches${count}
|
|
|
|
checkoptions_error=false
|
|
if test -s .mismatches${count}
|
|
then
|
|
while read -r LINE
|
|
do
|
|
if find "${REDHAT}"/configs -name "$(echo "$LINE" | awk -F "=" ' { print $1 } ' | awk ' { print $2 }')" -print0 | xargs -0 grep ^ | grep -q "process_configs_known_broken"; then
|
|
# This is a known broken config.
|
|
# See script help warning.
|
|
checkoptions_error=false
|
|
else
|
|
checkoptions_error=true
|
|
break
|
|
fi
|
|
done < .mismatches${count}
|
|
|
|
! $checkoptions_error && return
|
|
|
|
sed -i "1s/^/Error: Mismatches found in configuration files for ${arch} ${variant}\n/" .mismatches${count}
|
|
else
|
|
rm -f .mismatches${count}
|
|
fi
|
|
}
|
|
|
|
parsenewconfigs()
|
|
{
|
|
tmpdir=$(mktemp -d)
|
|
|
|
# This awk script reads the output of make listnewconfig
|
|
# and puts it into CONFIG_FOO files. Using the output of
|
|
# listnewconfig is much easier to ensure we get the default
|
|
# output.
|
|
/usr/bin/awk -v BASE="$tmpdir" '
|
|
/is not set/ {
|
|
split ($0, a, "#");
|
|
split(a[2], b);
|
|
OUT_FILE=BASE"/"b[1];
|
|
print $0 >> OUT_FILE;
|
|
}
|
|
|
|
/=/ {
|
|
split ($0, a, "=");
|
|
OUT_FILE=BASE"/"a[1];
|
|
if (a[2] == "n")
|
|
print "# " a[1] " is not set" >> OUT_FILE;
|
|
else
|
|
print $0 >> OUT_FILE;
|
|
}
|
|
|
|
' .newoptions
|
|
|
|
# This awk script parses the output of helpnewconfig.
|
|
# Each option is separated between ----- markers
|
|
# The goal is to put all the help text as a comment in
|
|
# each CONFIG_FOO file. Because of how awk works
|
|
# there's a lot of moving files around and catting to
|
|
# get what we need.
|
|
/usr/bin/awk -v BASE="$tmpdir" '
|
|
BEGIN { inpatch=0;
|
|
outfile="none";
|
|
symbol="none"; }
|
|
/^Symbol: .*$/ {
|
|
split($0, a, " ");
|
|
symbol="CONFIG_"a[2];
|
|
outfile=BASE "/fake_"symbol
|
|
}
|
|
/-----/ {
|
|
if (inpatch == 0) {
|
|
inpatch = 1;
|
|
}
|
|
else {
|
|
if (symbol != "none") {
|
|
system("cat " outfile " " BASE "/" symbol " > " BASE "/tmpf");
|
|
system("mv " BASE "/tmpf " BASE "/" symbol);
|
|
symbol="none"
|
|
}
|
|
outfile="none"
|
|
inpatch = 0;
|
|
}
|
|
}
|
|
!/-----/ {
|
|
if (inpatch == 1 && outfile != "none") {
|
|
print "# "$0 >> outfile;
|
|
}
|
|
}
|
|
|
|
|
|
' .helpnewconfig
|
|
|
|
pushd "$tmpdir" &> /dev/null
|
|
rm fake_*
|
|
popd &> /dev/null
|
|
for f in "$tmpdir"/*; do
|
|
[[ -e "$f" ]] || break
|
|
cp "$f" "$SCRIPT_DIR/pending$FLAVOR/generic/"
|
|
done
|
|
|
|
rm -rf "$tmpdir"
|
|
}
|
|
|
|
function commit_new_configs()
|
|
{
|
|
# assume we are in $source_tree/configs, need to get to top level
|
|
pushd "$(switch_to_toplevel)" &>/dev/null
|
|
|
|
for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}${SUBARCH}"*.config
|
|
do
|
|
arch=$(head -1 "$cfg" | cut -b 3-)
|
|
cfgtmp="${cfg}.tmp"
|
|
cfgorig="${cfg}.orig"
|
|
cat "$cfg" > "$cfgorig"
|
|
|
|
if [ "$arch" = "EMPTY" ]
|
|
then
|
|
# This arch is intentionally left blank
|
|
continue
|
|
fi
|
|
echo -n "Checking for new configs in $cfg ... "
|
|
|
|
make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" listnewconfig >& .listnewconfig
|
|
grep -E 'CONFIG_' .listnewconfig > .newoptions
|
|
if test -s .newoptions
|
|
then
|
|
make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" helpnewconfig >& .helpnewconfig
|
|
parsenewconfigs
|
|
fi
|
|
rm .newoptions
|
|
echo "done"
|
|
done
|
|
|
|
git add "$SCRIPT_DIR/pending$FLAVOR"
|
|
git commit -m "[redhat] AUTOMATIC: New configs"
|
|
}
|
|
|
|
function process_config()
|
|
{
|
|
local cfg
|
|
local arch
|
|
local cfgtmp
|
|
local cfgorig
|
|
local count
|
|
local variant
|
|
|
|
cfg=$1
|
|
count=$2
|
|
|
|
arch=$(head -1 "$cfg" | cut -b 3-)
|
|
|
|
if [ "$arch" = "EMPTY" ]
|
|
then
|
|
# This arch is intentionally left blank
|
|
return
|
|
fi
|
|
|
|
variant=$(basename "$cfg" | cut -d"-" -f3- | cut -d"." -f1)
|
|
|
|
cfgtmp="${cfg}.tmp"
|
|
cfgorig="${cfg}.orig"
|
|
cat "$cfg" > "$cfgorig"
|
|
|
|
echo "Processing $cfg ... "
|
|
|
|
make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" listnewconfig >& .listnewconfig${count}
|
|
grep -E 'CONFIG_' .listnewconfig${count} > .newoptions${count}
|
|
if test -n "$NEWOPTIONS" && test -s .newoptions${count}
|
|
then
|
|
echo "Found unset config items in ${arch} ${variant}, please set them to an appropriate value" >> .errors${count}
|
|
cat .newoptions${count} >> .errors${count}
|
|
rm .newoptions${count}
|
|
RETURNCODE=1
|
|
fi
|
|
rm .newoptions${count}
|
|
|
|
grep -E 'config.*warning' .listnewconfig${count} > .warnings${count}
|
|
if test -n "$CHECKWARNINGS" && test -s .warnings${count}
|
|
then
|
|
echo "Found misconfigured config items in ${arch} ${variant}, please set them to an appropriate value" >> .errors${count}
|
|
cat .warnings${count} >> .errors${count}
|
|
rm .warnings${count}
|
|
fi
|
|
rm .warnings${count}
|
|
|
|
rm .listnewconfig${count}
|
|
|
|
make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" olddefconfig > /dev/null || exit 1
|
|
echo "# $arch" > "$cfgtmp"
|
|
cat "$cfgorig" >> "$cfgtmp"
|
|
if test -n "$CHECKOPTIONS"
|
|
then
|
|
checkoptions "$cfg" "$cfgtmp" "$count" "$variant"
|
|
fi
|
|
# if test run, don't overwrite original
|
|
if test -n "$TESTRUN"
|
|
then
|
|
rm -f "$cfgtmp"
|
|
else
|
|
mv "$cfgtmp" "$cfg"
|
|
fi
|
|
rm -f "$cfgorig"
|
|
echo "Processing $cfg complete"
|
|
}
|
|
|
|
function process_configs()
|
|
{
|
|
# assume we are in $source_tree/configs, need to get to top level
|
|
pushd "$(switch_to_toplevel)" &>/dev/null
|
|
|
|
# The next line is throwaway code for transition to parallel
|
|
# processing. Leaving this line in place is harmless, but it can be
|
|
# removed the next time anyone updates this function.
|
|
[ -f .mismatches ] && rm -f .mismatches
|
|
|
|
count=0
|
|
for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}${SUBARCH}"*.config
|
|
do
|
|
if [ "$count" -eq 0 ]; then
|
|
# do the first one by itself so that tools are built
|
|
process_config "$cfg" "$count"
|
|
fi
|
|
process_config "$cfg" "$count" &
|
|
waitpids[${count}]=$!
|
|
((count++))
|
|
while [ "$(jobs | grep Running | wc -l)" -ge $RHJOBS ]; do :; done
|
|
done
|
|
for pid in ${waitpids[*]}; do
|
|
wait ${pid}
|
|
done
|
|
|
|
rm "$SCRIPT_DIR"/*.config*.old
|
|
|
|
if ls .errors* 1> /dev/null 2>&1; then
|
|
RETURNCODE=1
|
|
cat .errors*
|
|
rm .errors* -f
|
|
fi
|
|
if ls .mismatches* 1> /dev/null 2>&1; then
|
|
RETURNCODE=1
|
|
cat .mismatches*
|
|
rm .mismatches* -f
|
|
fi
|
|
|
|
popd > /dev/null
|
|
|
|
[ $RETURNCODE -eq 0 ] && echo "Processed config files are in $SCRIPT_DIR"
|
|
}
|
|
|
|
CHECKOPTIONS=""
|
|
NEWOPTIONS=""
|
|
TESTRUN=""
|
|
CHECKWARNINGS=""
|
|
MAKEOPTS=""
|
|
CC_IS_CLANG=0
|
|
|
|
RETURNCODE=0
|
|
|
|
while [[ $# -gt 0 ]]
|
|
do
|
|
key="$1"
|
|
case $key in
|
|
-a)
|
|
CHECKOPTIONS="x"
|
|
NEWOPTIONS="x"
|
|
CHECKWARNINGS="x"
|
|
;;
|
|
-c)
|
|
CHECKOPTIONS="x"
|
|
;;
|
|
-h)
|
|
usage
|
|
;;
|
|
-n)
|
|
NEWOPTIONS="x"
|
|
;;
|
|
-t)
|
|
TESTRUN="x"
|
|
;;
|
|
-w)
|
|
CHECKWARNINGS="x"
|
|
;;
|
|
-z)
|
|
COMMITNEWCONFIGS="x"
|
|
;;
|
|
-m)
|
|
shift
|
|
if [ "$1" = "CC=clang" -o "$1" = "LLVM=1" ]; then
|
|
CC_IS_CLANG=1
|
|
fi
|
|
MAKEOPTS="$MAKEOPTS $1"
|
|
;;
|
|
*)
|
|
break;;
|
|
esac
|
|
shift
|
|
done
|
|
|
|
PACKAGE_NAME="${1:-kernel}" # defines the package name used
|
|
KVERREL="$(test -n "$2" && echo "-$2" || echo "")"
|
|
SUBARCH="$(test -n "$3" && echo "-$3" || echo "")"
|
|
FLAVOR="$(test -n "$4" && echo "-$4" || echo "-common")"
|
|
RHJOBS="$(test -n "$5" && echo "$5" || nproc --all)"
|
|
SCRIPT=$(readlink -f "$0")
|
|
SCRIPT_DIR=$(dirname "$SCRIPT")
|
|
|
|
# Most RHEL options are options we want in Fedora so RHEL pending settings head
|
|
# to common/
|
|
if [ "$FLAVOR" = "-rhel" ]
|
|
then
|
|
FLAVOR="-common"
|
|
fi
|
|
|
|
# to handle this script being a symlink
|
|
cd "$SCRIPT_DIR"
|
|
|
|
if test -n "$COMMITNEWCONFIGS"; then
|
|
commit_new_configs
|
|
else
|
|
process_configs
|
|
fi
|
|
|
|
exit $RETURNCODE
|