aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-08-08 00:17:51 +0200
committerJames Morris <jmorris@namei.org>2010-10-21 10:12:32 +1100
commit68eda8f59081c74a51d037cc29893bd7c9b3c2d8 (patch)
tree5970a384719568f6f36ee07efe72adb8cfab39f1 /security
parentf6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff)
downloadmrst-s0i3-test-68eda8f59081c74a51d037cc29893bd7c9b3c2d8.tar.gz
mrst-s0i3-test-68eda8f59081c74a51d037cc29893bd7c9b3c2d8.tar.xz
mrst-s0i3-test-68eda8f59081c74a51d037cc29893bd7c9b3c2d8.zip
tomoyo: cleanup. don't store bogus pointer
If domain is NULL then &domain->list is a bogus address. Let's leave head->r.domain NULL instead of saving an unusable pointer. This is just a cleanup. The current code always checks head->r.eof before dereferencing head->r.domain. Signed-off-by: Dan Carpenter <error27@gmail.com> Acked-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Diffstat (limited to 'security')
-rw-r--r--security/tomoyo/common.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c
index c668b447c72..e0a1059aaf3 100644
--- a/security/tomoyo/common.c
+++ b/security/tomoyo/common.c
@@ -768,8 +768,10 @@ static bool tomoyo_select_one(struct tomoyo_io_buffer *head, const char *data)
return true; /* Do nothing if open(O_WRONLY). */
memset(&head->r, 0, sizeof(head->r));
head->r.print_this_domain_only = true;
- head->r.eof = !domain;
- head->r.domain = &domain->list;
+ if (domain)
+ head->r.domain = &domain->list;
+ else
+ head->r.eof = 1;
tomoyo_io_printf(head, "# select %s\n", data);
if (domain && domain->is_deleted)
tomoyo_io_printf(head, "# This is a deleted domain.\n");