Unverified Commit 6a8736d8 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6485 CVE-2024-26843 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yongqiang Liu <liuyongqiang13@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/3GJK6SO3LRYLHHDW6JECL42GTDVCKY6O/ 
Andrew Bresticker (1):
  efi: runtime: Fix potential overflow of soft-reserved region size


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/I9HJU0 
 
Link:https://gitee.com/openeuler/kernel/pulls/6485

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents bfaa0cba 56558ea1

drivers/firmware/efi/arm-runtime.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static int __init arm_enable_runtime_services(void) 
		efi_memory_desc_t *md;



		for_each_efi_memory_desc(md) {

			int md_size = md->num_pages << EFI_PAGE_SHIFT;

			u64 md_size = md->num_pages << EFI_PAGE_SHIFT;

			struct resource *res;



			if (!(md->attribute & EFI_MEMORY_SP))

drivers/firmware/efi/riscv-runtime.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static int __init riscv_enable_runtime_services(void) 
		efi_memory_desc_t *md;



		for_each_efi_memory_desc(md) {

			int md_size = md->num_pages << EFI_PAGE_SHIFT;

			u64 md_size = md->num_pages << EFI_PAGE_SHIFT;

			struct resource *res;



			if (!(md->attribute & EFI_MEMORY_SP))