Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Peter Anvin:
 "Several boot fixes (MacBook, legacy EFI bootloaders), another
  please-don't-brick fix, and some minor stuff."

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Do not try to sync identity map for non-mapped pages
  x86, doc: Be explicit about what the x86 struct boot_params requires
  x86: Don't clear efi_info even if the sentinel hits
  x86, mm: Make sure to find a 2M free block for the first mapped area
  x86: Fix 32-bit *_cpu_data initializers
  efivarfs: return accurate error code in efivarfs_fill_super()
  efivars: efivarfs_valid_name() should handle pstore syntax
  efi: be more paranoid about available space when creating variables
  iommu, x86: Add DMA remap fault reason
  x86, smpboot: Remove unused variable

1 files changed, 59 insertions, 0 deletions

diff --git a/tools/testing/selftests/efivarfs/efivarfs.sh b/tools/testing/selftests/efivarfs/efivarfs.sh
index 880cdd5dc63f..77edcdcc016b 100644
--- a/tools/testing/selftests/efivarfs/efivarfs.sh
+++ b/tools/testing/selftests/efivarfs/efivarfs.sh
@@ -125,6 +125,63 @@ test_open_unlink()
         ./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
@@ -135,5 +192,7 @@ 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