As requested, the merge of the EPC and EADD bug fix series. The headliners are two critical bug fixes for a memory leak in sgx_encl_destroy() and a livelock due to the EPC page free count getting corrupted. Sean Christopherson (12): x86/sgx: Pass EADD the kernel's virtual address for the source page x86/sgx: Check the validity of the source page address for EADD x86/sgx: Fix EEXTEND error handling x86/sgx: Drop mmap_sem before EEXTENDing an enclave page x86/sgx: Remove redundant message from WARN on non-emtpy mm_list x86/sgx: Fix a memory leak in sgx_encl_destroy() x86/sgx: WARN on any non-zero return from __eremove() x86/sgx: WARN only once if EREMOVE fails x86/sgx: Split second half of sgx_free_page() to a separate helper x86/sgx: Use the post-reclaim variant of __sgx_free_page() x86/sgx: Don't update free page count if EPC section allocation fails x86/sgx: Reinstate per EPC section free page counts arch/x86/kernel/cpu/sgx/encl.c | 29 ++++++++++------- arch/x86/kernel/cpu/sgx/ioctl.c | 52 +++++++++++++++-------------- arch/x86/kernel/cpu/sgx/main.c | 54 ++++++++++++++++++++++--------- arch/x86/kernel/cpu/sgx/reclaim.c | 8 ++--- arch/x86/kernel/cpu/sgx/sgx.h | 19 ++++++++++- 5 files changed, 106 insertions(+), 56 deletions(-) -- 2.22.0
