Unverified Commit 8e52c38e authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9855 [sync] PR-8096: Fix CVE-2024-35988 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/8096 
 
PR sync from: Zhao Mengmeng <zhaomengmeng@kylinos.cn>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/WTTZFR6UP6IDG5HHSR4OOUJ6EVOY4MHY/ 
Fix CVE-2024-35988, where "riscv: fix VMALLOC_START definition" is
the dependence.

Baoquan He (1):
  riscv: fix VMALLOC_START definition

Samuel Holland (1):
  riscv: Fix TASK_SIZE on 64-bit NOMMU


-- 
2.33.0
 
https://gitee.com/src-openeuler/kernel/issues/I9QRO0 
 
Link:https://gitee.com/openeuler/kernel/pulls/9855

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 8c84eb1c 3737a8ce

arch/riscv/include/asm/pgtable.h

+2 −2
Original line number Diff line number Diff line
@@ -456,8 +456,8 @@ static inline int ptep_clear_flush_young(struct vm_area_struct *vma, 
#define PAGE_SHARED		__pgprot(0)

#define PAGE_KERNEL		__pgprot(0)

#define swapper_pg_dir		NULL

#define TASK_SIZE		0xffffffffUL

#define VMALLOC_START		0

#define TASK_SIZE		_AC(-1, UL)

#define VMALLOC_START		_AC(0, UL)

#define VMALLOC_END		TASK_SIZE



static inline void __kernel_map_pages(struct page *page, int numpages, int enable) {}