Commit 4cfc2149 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tomoyo-pr-20251212' of git://git.code.sf.net/p/tomoyo/tomoyo 

Pull tomoyo update from Tetsuo Handa:
 "Trivial optimization"

* tag 'tomoyo-pr-20251212' of git://git.code.sf.net/p/tomoyo/tomoyo:
  tomoyo: Use local kmap in tomoyo_dump_page()
parents 4a298a43 a9ea3a2e

security/tomoyo/domain.c

+2 −7
Original line number Diff line number Diff line
@@ -934,17 +934,12 @@ bool tomoyo_dump_page(struct linux_binprm *bprm, unsigned long pos, 
#endif

	if (page != dump->page) {

		const unsigned int offset = pos % PAGE_SIZE;

		/*

		 * Maybe kmap()/kunmap() should be used here.

		 * But remove_arg_zero() uses kmap_atomic()/kunmap_atomic().

		 * So do I.

		 */

		char *kaddr = kmap_atomic(page);

		char *kaddr = kmap_local_page(page);



		dump->page = page;

		memcpy(dump->data + offset, kaddr + offset,

		       PAGE_SIZE - offset);

		kunmap_atomic(kaddr);

		kunmap_local(kaddr);

	}

	/* Same with put_arg_page(page) in fs/exec.c */

#ifdef CONFIG_MMU