efi/capsule-loader: Replace kmap() with kmap_local_page()
PATCH 1/1 efi/capsule-loader: Replace kmap() with kmap_local_page()
kmap() is deprecated in favour of kmap_local_page(), as described in Documentation/mm/highmem.rst.
The conversion is safe here. efi_capsule_write() maps the page and releases it within the same call, on both the success and the fail_unmap error path, so the mapping never escapes the thread that created it and the stack-based unmap ordering is preserved. No atomic context is
involved: the page is allocated with alloc_page(GFP_KERNEL) just above, and the copy_from_user() performed while the page is mapped is fine because faults are permitted in a local kmap region. efi_capsule_setup_info() also runs while the mapping is live, but only reads through the pointer.
kunmap_local() is handed a pointer that has been advanced into the page, which is fine as it masks the address back down to the page boundary.
Build-tested only, on i386 with CONFIG_HIGHMEM=y -- where kmap_local_page() actually establishes a mapping rather than returning the direct-map address -- and on x86_64. No new gcc or sparse warnings.
--- drivers/firmware/efi/capsule-loader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/firmware/efi/capsule-loader.c +3 -3
@@ -197,7 +197,7 @@ static ssize_t efi_capsule_write(struct file *file, const char __user *buff, page = cap_info->pages[cap_info->index -1 ]; } - kbuff =kmap (page); + kbuff =kmap_local_page (page); kbuff +=PAGE_SIZE - cap_info->page_bytes_remain;/* Copy capsule binary data from user space to kernel space buffer */
@@ -217,7 +217,7 @@ static ssize_t efi_capsule_write(struct file *file, const char __user *buff, } cap_info->count += write_byte; -kunmap (page); +kunmap_local (kbuff);/* Submit the full binary to efi_capsule_update() API */ if (cap_info->header.headersize > 0 &&
@@ -236,7 +236,7 @@ static ssize_t efi_capsule_write(struct file *file, const char __user *buff,return write_byte; fail_unmap: -kunmap (page); +kunmap_local (kbuff); failed:efi_free_all_buff_pages (cap_info);return ret;
Signature · 1 line
2.55.0
Quoted 20 lines · Danish Khateeb
kmap()is deprecated in favour ofkmap_local_page(), as described inDocumentation/mm/highmem.rst.The conversion is safe here.
efi_capsule_write()maps the page and releases it within the same call, on both the success and thefail_unmaperror path, so the mapping never escapes the thread that created it and the stack-based unmap ordering is preserved. No atomic context is
involved: the page is allocated withalloc_page(GFP_KERNEL)just above, and thecopy_from_user()performed while the page is mapped is fine because faults are permitted in a local kmap region.efi_capsule_setup_info()also runs while the mapping is live, but only reads through the pointer.
kunmap_local()is handed a pointer that has been advanced into the page, which is fine as it masks the address back down to the page boundary.Build-tested only, on i386 with
CONFIG_HIGHMEM=y-- wherekmap_local_page()actually establishes a mapping rather than returning the direct-map address -- and onx86_64. No new gcc or sparse warnings.
Quoted 6 lines
Assisted-by LLM sparseSigned-off-by Danish Khateeb <[email protected]>--- drivers/firmware/efi/capsule-loader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Queued up in efi/next - thanks.