Skip to content

Commit 4cfc214

Browse files
committed
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()
2 parents 4a298a4 + a9ea3a2 commit 4cfc214

1 file changed

Lines changed: 2 additions & 7 deletions

File tree

security/tomoyo/domain.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -934,17 +934,12 @@ bool tomoyo_dump_page(struct linux_binprm *bprm, unsigned long pos,
934934
#endif
935935
if (page != dump->page) {
936936
const unsigned int offset = pos % PAGE_SIZE;
937-
/*
938-
* Maybe kmap()/kunmap() should be used here.
939-
* But remove_arg_zero() uses kmap_atomic()/kunmap_atomic().
940-
* So do I.
941-
*/
942-
char *kaddr = kmap_atomic(page);
937+
char *kaddr = kmap_local_page(page);
943938

944939
dump->page = page;
945940
memcpy(dump->data + offset, kaddr + offset,
946941
PAGE_SIZE - offset);
947-
kunmap_atomic(kaddr);
942+
kunmap_local(kaddr);
948943
}
949944
/* Same with put_arg_page(page) in fs/exec.c */
950945
#ifdef CONFIG_MMU

0 commit comments

Comments
 (0)