Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into x86/urgent

Pull EFI bug fixes from Matt Fleming:

 * Fix bugs in our code that converts ucs2 strings to utf8 where we
   unintentionally drop bits from the original string (Jason Andryuk)

 * Add the efi-pstore variables to the variable whitelist so that
   users can continue to delete them via efivarfs without needing to
   manipulate the immutable flag (Matt Fleming)

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2 files changed, 8 insertions, 7 deletions

diff --git a/drivers/firmware/efi/vars.c b/drivers/firmware/efi/vars.c
index 50f10bad2604..7f2ea21c730d 100644
--- a/drivers/firmware/efi/vars.c
+++ b/drivers/firmware/efi/vars.c
@@ -198,6 +198,7 @@ static const struct variable_validate variable_validate[] = {
         { EFI_GLOBAL_VARIABLE_GUID, "OsIndications", NULL },
         { EFI_GLOBAL_VARIABLE_GUID, "PlatformLang", validate_ascii_string },
         { EFI_GLOBAL_VARIABLE_GUID, "Timeout", validate_uint16 },
+        { LINUX_EFI_CRASH_GUID, "*", NULL },
         { NULL_GUID, "", NULL },
 };
 
diff --git a/lib/ucs2_string.c b/lib/ucs2_string.c
index 17dd74e21ef9..f0b323abb4c6 100644
--- a/lib/ucs2_string.c
+++ b/lib/ucs2_string.c
@@ -59,9 +59,9 @@ ucs2_utf8size(const ucs2_char_t *src)
         for (i = 0; i < ucs2_strlen(src); i++) {
                 u16 c = src[i];
 
-                if (c > 0x800)
+                if (c >= 0x800)
                         j += 3;
-                else if (c > 0x80)
+                else if (c >= 0x80)
                         j += 2;
                 else
                         j += 1;
@@ -88,19 +88,19 @@ ucs2_as_utf8(u8 *dest, const ucs2_char_t *src, unsigned long maxlength)
         for (i = 0; maxlength && i < limit; i++) {
                 u16 c = src[i];
 
-                if (c > 0x800) {
+                if (c >= 0x800) {
                         if (maxlength < 3)
                                 break;
                         maxlength -= 3;
                         dest[j++] = 0xe0 | (c & 0xf000) >> 12;
-                        dest[j++] = 0x80 | (c & 0x0fc0) >> 8;
+                        dest[j++] = 0x80 | (c & 0x0fc0) >> 6;
                         dest[j++] = 0x80 | (c & 0x003f);
-                } else if (c > 0x80) {
+                } else if (c >= 0x80) {
                         if (maxlength < 2)
                                 break;
                         maxlength -= 2;
-                        dest[j++] = 0xc0 | (c & 0xfe0) >> 5;
-                        dest[j++] = 0x80 | (c & 0x01f);
+                        dest[j++] = 0xc0 | (c & 0x7c0) >> 6;
+                        dest[j++] = 0x80 | (c & 0x03f);
                 } else {
                         maxlength -= 1;
                         dest[j++] = c & 0x7f;