123abd76ed
Stricter validation was introduced with commitda27a24383("efivarfs: guid part of filenames are case-insensitive") and commit47f531e8ba("efivarfs: Validate filenames much more aggressively"), which is necessary for the guid portion of efivarfs filenames, but we don't need to be so strict with the first part, the variable name. The UEFI specification doesn't impose any constraints on variable names other than they be a NULL-terminated string. The above commits caused a regression that resulted in users seeing the following message, $ sudo mount -v /sys/firmware/efi/efivars mount: Cannot allocate memory whenever pstore EFI variables were present in the variable store, since their variable names failed to pass the following check, /* GUID should be right after the first '-' */ if (s - 1 != strchr(str, '-')) as a typical pstore filename is of the form, dump-type0-10-1-<guid>. The fix is trivial since the guid portion of the filename is GUID_LEN bytes, we can use (len - GUID_LEN) to ensure the '-' character is where we expect it to be. (The bogus ENOMEM error value will be fixed in a separate patch.) Reported-by: Joseph Yasi <joe.yasi@gmail.com> Tested-by: Joseph Yasi <joe.yasi@gmail.com> Reported-by: Lingzhu Xiang <lxiang@redhat.com> Cc: Josh Boyer <jwboyer@redhat.com> Cc: Jeremy Kerr <jk@ozlabs.org> Cc: Matthew Garrett <mjg59@srcf.ucam.org> Cc: <stable@vger.kernel.org> # v3.8 Signed-off-by: Matt Fleming <matt.fleming@intel.com>
199 lines
3.3 KiB
Bash
199 lines
3.3 KiB
Bash
#!/bin/bash
|
|
|
|
efivarfs_mount=/sys/firmware/efi/efivars
|
|
test_guid=210be57c-9849-4fc7-a635-e6382d1aec27
|
|
|
|
check_prereqs()
|
|
{
|
|
local msg="skip all tests:"
|
|
|
|
if [ $UID != 0 ]; then
|
|
echo $msg must be run as root >&2
|
|
exit 0
|
|
fi
|
|
|
|
if ! grep -q "^\S\+ $efivarfs_mount efivarfs" /proc/mounts; then
|
|
echo $msg efivarfs is not mounted on $efivarfs_mount >&2
|
|
exit 0
|
|
fi
|
|
}
|
|
|
|
run_test()
|
|
{
|
|
local test="$1"
|
|
|
|
echo "--------------------"
|
|
echo "running $test"
|
|
echo "--------------------"
|
|
|
|
if [ "$(type -t $test)" = 'function' ]; then
|
|
( $test )
|
|
else
|
|
( ./$test )
|
|
fi
|
|
|
|
if [ $? -ne 0 ]; then
|
|
echo " [FAIL]"
|
|
rc=1
|
|
else
|
|
echo " [PASS]"
|
|
fi
|
|
}
|
|
|
|
test_create()
|
|
{
|
|
local attrs='\x07\x00\x00\x00'
|
|
local file=$efivarfs_mount/$FUNCNAME-$test_guid
|
|
|
|
printf "$attrs\x00" > $file
|
|
|
|
if [ ! -e $file ]; then
|
|
echo "$file couldn't be created" >&2
|
|
exit 1
|
|
fi
|
|
|
|
if [ $(stat -c %s $file) -ne 5 ]; then
|
|
echo "$file has invalid size" >&2
|
|
exit 1
|
|
fi
|
|
}
|
|
|
|
test_create_empty()
|
|
{
|
|
local file=$efivarfs_mount/$FUNCNAME-$test_guid
|
|
|
|
: > $file
|
|
|
|
if [ ! -e $file ]; then
|
|
echo "$file can not be created without writing" >&2
|
|
exit 1
|
|
fi
|
|
}
|
|
|
|
test_create_read()
|
|
{
|
|
local file=$efivarfs_mount/$FUNCNAME-$test_guid
|
|
./create-read $file
|
|
}
|
|
|
|
test_delete()
|
|
{
|
|
local attrs='\x07\x00\x00\x00'
|
|
local file=$efivarfs_mount/$FUNCNAME-$test_guid
|
|
|
|
printf "$attrs\x00" > $file
|
|
|
|
if [ ! -e $file ]; then
|
|
echo "$file couldn't be created" >&2
|
|
exit 1
|
|
fi
|
|
|
|
rm $file
|
|
|
|
if [ -e $file ]; then
|
|
echo "$file couldn't be deleted" >&2
|
|
exit 1
|
|
fi
|
|
|
|
}
|
|
|
|
# test that we can remove a variable by issuing a write with only
|
|
# attributes specified
|
|
test_zero_size_delete()
|
|
{
|
|
local attrs='\x07\x00\x00\x00'
|
|
local file=$efivarfs_mount/$FUNCNAME-$test_guid
|
|
|
|
printf "$attrs\x00" > $file
|
|
|
|
if [ ! -e $file ]; then
|
|
echo "$file does not exist" >&2
|
|
exit 1
|
|
fi
|
|
|
|
printf "$attrs" > $file
|
|
|
|
if [ -e $file ]; then
|
|
echo "$file should have been deleted" >&2
|
|
exit 1
|
|
fi
|
|
}
|
|
|
|
test_open_unlink()
|
|
{
|
|
local file=$efivarfs_mount/$FUNCNAME-$test_guid
|
|
./open-unlink $file
|
|
}
|
|
|
|
# test that we can create a range of filenames
|
|
test_valid_filenames()
|
|
{
|
|
local attrs='\x07\x00\x00\x00'
|
|
local ret=0
|
|
|
|
local file_list="abc dump-type0-11-1-1362436005 1234 -"
|
|
for f in $file_list; do
|
|
local file=$efivarfs_mount/$f-$test_guid
|
|
|
|
printf "$attrs\x00" > $file
|
|
|
|
if [ ! -e $file ]; then
|
|
echo "$file could not be created" >&2
|
|
ret=1
|
|
else
|
|
rm $file
|
|
fi
|
|
done
|
|
|
|
exit $ret
|
|
}
|
|
|
|
test_invalid_filenames()
|
|
{
|
|
local attrs='\x07\x00\x00\x00'
|
|
local ret=0
|
|
|
|
local file_list="
|
|
-1234-1234-1234-123456789abc
|
|
foo
|
|
foo-bar
|
|
-foo-
|
|
foo-barbazba-foob-foob-foob-foobarbazfoo
|
|
foo-------------------------------------
|
|
-12345678-1234-1234-1234-123456789abc
|
|
a-12345678=1234-1234-1234-123456789abc
|
|
a-12345678-1234=1234-1234-123456789abc
|
|
a-12345678-1234-1234=1234-123456789abc
|
|
a-12345678-1234-1234-1234=123456789abc
|
|
1112345678-1234-1234-1234-123456789abc"
|
|
|
|
for f in $file_list; do
|
|
local file=$efivarfs_mount/$f
|
|
|
|
printf "$attrs\x00" 2>/dev/null > $file
|
|
|
|
if [ -e $file ]; then
|
|
echo "Creating $file should have failed" >&2
|
|
rm $file
|
|
ret=1
|
|
fi
|
|
done
|
|
|
|
exit $ret
|
|
}
|
|
|
|
check_prereqs
|
|
|
|
rc=0
|
|
|
|
run_test test_create
|
|
run_test test_create_empty
|
|
run_test test_create_read
|
|
run_test test_delete
|
|
run_test test_zero_size_delete
|
|
run_test test_open_unlink
|
|
run_test test_valid_filenames
|
|
run_test test_invalid_filenames
|
|
|
|
exit $rc
|