Commit be9318cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_sgx_for_6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull sgx update from Dave Hansen:

 - Use vmalloc_array() instead of vmalloc()

* tag 'x86_sgx_for_6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/sgx: Use vmalloc_array() instead of vmalloc()
parents 563cb0b1 f060c89d

arch/x86/kernel/cpu/sgx/main.c

+1 −1
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ static bool __init sgx_setup_epc_section(u64 phys_addr, u64 size, 
	if (!section->virt_addr)

		return false;



	section->pages = vmalloc(nr_pages * sizeof(struct sgx_epc_page));

	section->pages = vmalloc_array(nr_pages, sizeof(struct sgx_epc_page));

	if (!section->pages) {

		memunmap(section->virt_addr);

		return false;