mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-12-27 10:01:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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()
This commit is contained in:
Linus Torvalds
2025-12-14 15:21:02 +12:00
parent 4a298a43f5 a9ea3a2e08
commit 4cfc21494a
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
security/tomoyo/domain.c
View File

@@ -934,17 +934,12 @@ bool tomoyo_dump_page(struct linux_binprm *bprm, unsigned long pos,
#endif #endif
if (page != dump->page) { if (page != dump->page) {
const unsigned int offset = pos % PAGE_SIZE; const unsigned int offset = pos % PAGE_SIZE;
/* char *kaddr = kmap_local_page(page);
* Maybe kmap()/kunmap() should be used here.
* But remove_arg_zero() uses kmap_atomic()/kunmap_atomic().
* So do I.
*/
char *kaddr = kmap_atomic(page);
dump->page = page; dump->page = page;
memcpy(dump->data + offset, kaddr + offset, memcpy(dump->data + offset, kaddr + offset,
PAGE_SIZE - offset); PAGE_SIZE - offset);
kunmap_atomic(kaddr); kunmap_local(kaddr);
} }
/* Same with put_arg_page(page) in fs/exec.c */ /* Same with put_arg_page(page) in fs/exec.c */
#ifdef CONFIG_MMU #ifdef CONFIG_MMU