Commitc2fe61d

nivedita76

authored and

ardbiesheuvel

committed

efi/x86: Free efi_pgd with free_pages()

Commitd9e9a64 ("x86/mm/pti: Allocate a separate user PGD")changed the PGD allocation to allocate PGD_ALLOCATION_ORDER pages, so inthe error path it should be freed using free_pages() rather thanfree_page().Commit06ace26 ("x86/efi: Free efi_pgd with free_pages()")fixed one instance of this, but missed another.Move the freeing out-of-line to avoid code duplication and fix this bug.Fixes:d9e9a64 ("x86/mm/pti: Allocate a separate user PGD")Link:https://lore.kernel.org/r/20201110163919.1134431-1-nivedita@alum.mit.eduSigned-off-by: Arvind Sankar <nivedita@alum.mit.edu>Signed-off-by: Ard Biesheuvel <ardb@kernel.org>

1 parentfe5186c commitc2fe61dCopy full SHA for c2fe61d

File tree

1 file changed

+13

-11

lines changed

arch/x86/platform/efi
- efi_64.c

1 file changed

+13

-11

lines changed

`‎arch/x86/platform/efi/efi_64.c‎`

Lines changed: 13 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -78,28 +78,30 @@ int __init efi_alloc_page_tables(void)`
`78`	`78`	`gfp_mask=GFP_KERNEL \|__GFP_ZERO;`
`79`	`79`	`efi_pgd= (pgd_t*)__get_free_pages(gfp_mask,PGD_ALLOCATION_ORDER);`
`80`	`80`	`if (!efi_pgd)`
`81`		`-return-ENOMEM;`
	`81`	`+gotofail;`
`82`	`82`
`83`	`83`	`pgd=efi_pgd+pgd_index(EFI_VA_END);`
`84`	`84`	`p4d=p4d_alloc(&init_mm,pgd,EFI_VA_END);`
`85`		`-if (!p4d) {`
`86`		`-free_page((unsigned long)efi_pgd);`
`87`		`-return-ENOMEM;`
`88`		`-}`
	`85`	`+if (!p4d)`
	`86`	`+gotofree_pgd;`
`89`	`87`
`90`	`88`	`pud=pud_alloc(&init_mm,p4d,EFI_VA_END);`
`91`		`-if (!pud) {`
`92`		`-if (pgtable_l5_enabled())`
`93`		`-free_page((unsigned long)pgd_page_vaddr(*pgd));`
`94`		`-free_pages((unsigned long)efi_pgd,PGD_ALLOCATION_ORDER);`
`95`		`-return-ENOMEM;`
`96`		`-}`
	`89`	`+if (!pud)`
	`90`	`+gotofree_p4d;`
`97`	`91`
`98`	`92`	`efi_mm.pgd=efi_pgd;`
`99`	`93`	`mm_init_cpumask(&efi_mm);`
`100`	`94`	`init_new_context(NULL,&efi_mm);`
`101`	`95`
`102`	`96`	`return0;`
	`97`	`+`
	`98`	`+free_p4d:`
	`99`	`+if (pgtable_l5_enabled())`
	`100`	`+free_page((unsigned long)pgd_page_vaddr(*pgd));`
	`101`	`+free_pgd:`
	`102`	`+free_pages((unsigned long)efi_pgd,PGD_ALLOCATION_ORDER);`
	`103`	`+fail:`
	`104`	`+return-ENOMEM;`
`103`	`105`	`}`
`104`	`106`
`105`	`107`	`/*`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitc2fe61d

File tree

1 file changed

1 file changed

`‎arch/x86/platform/efi/efi_64.c‎`

0 commit comments