Skip to content

Not to generate hashes for initrd or modules if module.sig_enforce=1 … #294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
persmule wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Not to generate hashes for initrd or modules if module.sig_enforce=1 … #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 36 additions & 6 deletions initrd/bin/kexec-boot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,17 @@ set -e -o pipefail

dryrun="n"
printfiles="n"
printfilestohash="n"
printinitrd="n"
while getopts "b:e:r:a:o:fi" arg; do
while getopts "b:e:r:a:o:fhi" arg; do
case $arg in
b) bootdir="$OPTARG" ;;
e) entry="$OPTARG" ;;
r) cmdremove="$OPTARG" ;;
a) cmdadd="$OPTARG" ;;
o) override_initrd="$OPTARG" ;;
f) dryrun="y"; printfiles="y" ;;
h) dryrun="y"; printfilestohash="y" ;;
i) dryrun="y"; printinitrd="y" ;;
esac
done
Expand All @@ -32,12 +34,12 @@ kexeccmd="kexec"
cmdadd="$CONFIG_BOOT_KERNEL_ADD $cmdadd"
cmdremove="$CONFIG_BOOT_KERNEL_REMOVE $cmdremove"

fix_file_path() {
if [ "$printfiles" = "y" ]; then
# output file relative to local boot directory
echo ".$firstval"
fi
printfilename() {
# output filename relative to local boot directory
echo ".$firstval"
}

fix_file_path() {
filepath="$bootdir$firstval"

if ! [ -r $filepath ]; then
Expand All @@ -59,6 +61,17 @@ adjust_cmd_line() {
adjusted_cmd_line="y"
}

hash_modules="y"
if [ "$CONFIG_BOOT_RESPECT_MOD_SIG_ENFORCE" = "y" ]; then
# check whether "module.sig_enforce=1" present
# in the "append" line
if grep -q '^append.*\ module.sig_enforce=1'; then
hash_modules="n"
fi << EOF
$kexecparams
EOF
fi

module_number="1"
while read line
do
Expand All @@ -67,6 +80,11 @@ do
restval=`echo $line | cut -d\ -f3-`
if [ "$key" = "kernel" ]; then
fix_file_path
if [ "$printfiles" = "y" \
-o "$printfilestohash" = "y" ] \
; then
printfilename
fi
if [ "$kexectype" = "xen" ]; then
# always use xen with custom arguments
kexeccmd="$kexeccmd -l $filepath"
Expand All @@ -80,6 +98,12 @@ do
fi
if [ "$key" = "module" ]; then
fix_file_path
if [ "$printfiles" = "y" \
-o "$printfilestohash" = "y" \
-a "$hash_modules" = "y" ] \
; then
printfilename
fi
cmdline="$restval"
if [ "$kexectype" = "xen" ]; then
if [ "$module_number" -eq 1 ]; then
Expand All @@ -99,6 +123,12 @@ do
fi
if [ "$key" = "initrd" ]; then
fix_file_path
if [ "$printfiles" = "y" \
-o "$printfilestohash" = "y" \
-a "$hash_modules" = "y" ] \
; then
printfilename
fi
if [ "$printinitrd" = "y" ]; then
# output the current path to initrd
echo $filepath
Expand Down
2 changes: 1 addition & 1 deletion initrd/bin/kexec-save-default
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ if [ ! -d $paramsdir ]; then
fi
rm "$paramsdir/kexec_default.*.txt" 2>/dev/null || true
echo "$entry" > $ENTRY_FILE
cd $bootdir && kexec-boot -b "$bootdir" -e "$entry" -f | \
cd $bootdir && kexec-boot -b "$bootdir" -e "$entry" -h | \
xargs sha256sum > $HASH_FILE \
|| die "Failed to create hashes of boot files"
if [ ! -r $ENTRY_FILE -o ! -r $HASH_FILE ]; then
Expand Down