Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 06:33:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

EFI fixes for v5.13-rc

Browse Source 
A handful of low urgency EFI fixes accumulated over the past couple of
 months.
 -----BEGIN PGP SIGNATURE-----
 
 iQGzBAABCgAdFiEE+9lifEBpyUIVN1cpw08iOZLZjyQFAmCo+40ACgkQw08iOZLZ
 jyTGDgwAoCSOfLbXXS3/AqtiocDJPmsazo39eVU10RVuHlp4eh/CNlE9kjT3cp3p
 82YjpDMPoYR15TQg8JskexwrRecT60SaHEXtCY9aDhtm4LaPUnmWsAbPFnBxuTYh
 /yCpfovdIl/fE48O98T2kBtbSC9eORuN7rA0wV0OCm+t4R50RZKu9sLJrP2K+E12
 CIh7k3f1CmMT8xxPctVMEspDOynHkh2JZLdRkLu5KLhiZcC2HP4hPMgkCorYEC6Y
 zUvjtw8fRVytap5W6NVe3SHg/nYMwkkGnUtF8a7O+bDTsmnI5mrtq1XNRijB25jI
 al/mgqdatcbWD24RM7rBHLWUXUWQoP39bU9BjEkJkCmEeHXvERwdYFqlqbgIHElm
 oT1i4LmgPk+WD+yv248vUXv0dwQ7Lb+FkpLGDGNTSo59dQpsdh5OfHmELs4rmhHb
 DutTcnu3aMjmUo4JW3XPMPbUjYtJ54mw5dp2H04HnL7OkThGRjGFsIa2aQzL8oGl
 2CpeEny0
 =2MZv
 -----END PGP SIGNATURE-----

Merge tag 'efi-urgent-for-v5.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgent

Pull EFI fixes for v5.13-rc from Ard Biesheuvel:

  "A handful of low urgency EFI fixes accumulated over the past couple of
   months."

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2021-05-23 11:39:02 +02:00
commit e169fba4f4
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/firmware/efi/cper.c
View File

@ -276,8 +276,7 @@ static int cper_dimm_err_location(struct cper_mem_err_compact *mem, char *msg)
if (!msg || !(mem->validation_bits & CPER_MEM_VALID_MODULE_HANDLE))
return 0;
n = 0;
len = CPER_REC_LEN - 1;
len = CPER_REC_LEN;
dmi_memdev_name(mem->mem_dev_handle, &bank, &device);
if (bank && device)
n = snprintf(msg, len, "DIMM location: %s %s ", bank, device);
@ -286,7 +285,6 @@ static int cper_dimm_err_location(struct cper_mem_err_compact *mem, char *msg)
"DIMM location: not present. DMI handle: 0x%.4x ",
mem->mem_dev_handle);
msg[n] = '\0';
return n;
}

3
drivers/firmware/efi/fdtparams.c
View File

@ -98,6 +98,9 @@ u64 __init efi_get_fdt_params(struct efi_memory_map_data *mm)
BUILD_BUG_ON(ARRAY_SIZE(target) != ARRAY_SIZE(name));
BUILD_BUG_ON(ARRAY_SIZE(target) != ARRAY_SIZE(dt_params[0].params));
if (!fdt)
return 0;
for (i = 0; i < ARRAY_SIZE(dt_params); i++) {
node = fdt_path_offset(fdt, dt_params[i].path);
if (node < 0)

2
drivers/firmware/efi/libstub/file.c
View File

@ -103,7 +103,7 @@ static int find_file_option(const efi_char16_t *cmdline, int cmdline_len,
return 0;
/* Skip any leading slashes */
while (cmdline[i] == L'/' || cmdline[i] == L'\\')
while (i < cmdline_len && (cmdline[i] == L'/' || cmdline[i] == L'\\'))
i++;
while (--result_len > 0 && i < cmdline_len) {

5
drivers/firmware/efi/memattr.c
View File

@ -67,11 +67,6 @@ static bool entry_is_valid(const efi_memory_desc_t *in, efi_memory_desc_t *out)
return false;
}
if (!(in->attribute & (EFI_MEMORY_RO | EFI_MEMORY_XP))) {
pr_warn("Entry attributes invalid: RO and XP bits both cleared\n");
return false;
}
if (PAGE_SIZE > EFI_PAGE_SIZE &&
(!PAGE_ALIGNED(in->phys_addr) ||
!PAGE_ALIGNED(in->num_pages << EFI_PAGE_SHIFT))) {