[patch] tomoyo: cleanup. don't store bogus pointer

[patch] tomoyo: cleanup. don't store bogus pointer

[Dan Carpenter]

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>

diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c
index ef43995..a4dc2d5 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");

Re: [patch] tomoyo: cleanup. don't store bogus pointer

[Tetsuo Handa]

Dan Carpenter wrote:

> 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>

I see. Thank you.

Acked-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>

Re: [patch] tomoyo: cleanup. don't store bogus pointer

[James Morris]

On Tue, 10 Aug 2010, Tetsuo Handa wrote:

> Dan Carpenter wrote:
> 
> > 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>
> 
> I see. Thank you.
> 
> Acked-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>


Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next

-- 
James Morris
<jmorris@namei.org>