diff options
| author | Mark Brown <broonie@kernel.org> | 2024-10-07 16:01:00 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-10-07 16:01:00 +0300 |
| commit | 85eadae61931f6268b49b5722039e5a248b9ee4c (patch) | |
| tree | 3ee81f25a394ce2a2ec706f0aff07515b78d4b01 /security/tomoyo/common.c | |
| parent | dc16594d9967773ca891b3d9111f152e3c99d1cf (diff) | |
| parent | 8cf0b93919e13d1e8d4466eb4080a4c4d9d66d7b (diff) | |
| download | linux-85eadae61931f6268b49b5722039e5a248b9ee4c.tar.xz | |
regulator: Merge up v6.12-rc2
Pulls in a build fix for the KVM selftests.
Diffstat (limited to 'security/tomoyo/common.c')
| -rw-r--r-- | security/tomoyo/common.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c index c0ef014f8009..5c7b059a332a 100644 --- a/security/tomoyo/common.c +++ b/security/tomoyo/common.c @@ -998,13 +998,8 @@ static bool tomoyo_select_domain(struct tomoyo_io_buffer *head, p = find_task_by_pid_ns(pid, &init_pid_ns); else p = find_task_by_vpid(pid); - if (p) { + if (p) domain = tomoyo_task(p)->domain_info; -#ifdef CONFIG_SECURITY_TOMOYO_LKM - if (!domain) - domain = &tomoyo_kernel_domain; -#endif - } rcu_read_unlock(); } else if (!strncmp(data, "domain=", 7)) { if (tomoyo_domain_def(data + 7)) @@ -1715,13 +1710,8 @@ static void tomoyo_read_pid(struct tomoyo_io_buffer *head) p = find_task_by_pid_ns(pid, &init_pid_ns); else p = find_task_by_vpid(pid); - if (p) { + if (p) domain = tomoyo_task(p)->domain_info; -#ifdef CONFIG_SECURITY_TOMOYO_LKM - if (!domain) - domain = &tomoyo_kernel_domain; -#endif - } rcu_read_unlock(); if (!domain) return; |