diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-24 11:33:07 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-24 11:33:07 -0700 |
commit | 5af4b523ba9be70372eafab02ebfb9babf77ec7d (patch) | |
tree | 05738790051a25833eeaeb20c317b6ac3de05086 /security/tomoyo/common.c | |
parent | 08e30833f86ba25945e416b9f372791aacfef153 (diff) | |
parent | c120c98486c2855d2ae266c2af63d26f61dfcc4e (diff) | |
download | linux-5af4b523ba9be70372eafab02ebfb9babf77ec7d.tar.gz |
Merge tag 'tomoyo-pr-20230424' of git://git.osdn.net/gitroot/tomoyo/tomoyo-test1
Pull tomoyo update from Tetsuo Handa:
"One cleanup patch from Vlastimil Babka"
* tag 'tomoyo-pr-20230424' of git://git.osdn.net/gitroot/tomoyo/tomoyo-test1:
tomoyo: replace tomoyo_round2() with kmalloc_size_roundup()
Diffstat (limited to 'security/tomoyo/common.c')
-rw-r--r-- | security/tomoyo/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c index f4cd9b58b205..969d4aa6fd55 100644 --- a/security/tomoyo/common.c +++ b/security/tomoyo/common.c @@ -2094,7 +2094,7 @@ int tomoyo_supervisor(struct tomoyo_request_info *r, const char *fmt, ...) tomoyo_add_entry(r->domain, entry.query); goto out; } - len = tomoyo_round2(entry.query_len); + len = kmalloc_size_roundup(entry.query_len); entry.domain = r->domain; spin_lock(&tomoyo_query_list_lock); if (tomoyo_memory_quota[TOMOYO_MEMORY_QUERY] && |