Commit 54d79483 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents 9c70f046 1fcd0091

arch/x86/mm/ident_map.c

+10 −2
Original line number Diff line number Diff line
@@ -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));

	}