diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-14 13:31:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-14 13:31:31 -0800 |
| commit | 54d794830f4dd6caf688be3cc802e165952c4079 (patch) | |
| tree | f83610214638737f4cd354212cc8b594cb03d88f /arch/x86 | |
| parent | 9c70f046787505127f2f8bb60ad24bb3c8bfc61a (diff) | |
| parent | 1fcd009102ee02e217f2e7635ab65517d785da8e (diff) | |
| download | linux-54d794830f4dd6caf688be3cc802e165952c4079.tar.bz2 | |
Merge tag 'x86_mm_for_v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 mm update from Borislav Petkov:
"A single improvement to check ident_pud_init()'s return value (Arvind
Sankar)"
* tag 'x86_mm_for_v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/mm/ident_map: Check for errors from ident_pud_init()
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/mm/ident_map.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/x86/mm/ident_map.c b/arch/x86/mm/ident_map.c index fe7a12599d8e..968d7005f4a7 100644 --- a/arch/x86/mm/ident_map.c +++ b/arch/x86/mm/ident_map.c @@ -62,6 +62,7 @@ static int ident_p4d_init(struct x86_mapping_info *info, p4d_t *p4d_page, unsigned long addr, unsigned long end) { unsigned long next; + int result; for (; addr < end; addr = next) { p4d_t *p4d = p4d_page + p4d_index(addr); @@ -73,13 +74,20 @@ static int ident_p4d_init(struct x86_mapping_info *info, p4d_t *p4d_page, if (p4d_present(*p4d)) { pud = pud_offset(p4d, 0); - ident_pud_init(info, pud, addr, next); + result = ident_pud_init(info, pud, addr, next); + if (result) + return result; + continue; } pud = (pud_t *)info->alloc_pgt_page(info->context); if (!pud) return -ENOMEM; - ident_pud_init(info, pud, addr, next); + + result = ident_pud_init(info, pud, addr, next); + if (result) + return result; + set_p4d(p4d, __p4d(__pa(pud) | info->kernpg_flag)); } |