Commit e77dc346 authored May 12, 2011 by Tetsuo Handa Committed by James Morris May 12, 2011

TOMOYO: Fix wrong domainname validation.

In tomoyo_correct_domain() since 2.6.36, TOMOYO was by error validating
"<kernel>" + "/foo/\" + "/bar" when "<kernel> /foo/\* /bar" was given.
As a result, legal domainnames like "<kernel> /foo/\* /bar" are rejected.

Reported-by: Hayama Yossihiro <yossi@yedo.src.co.jp>
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: James Morris <jmorris@namei.org>

parent 3a852d3b

security/tomoyo/util.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -390,7 +390,7 @@ bool tomoyo_correct_domain(const unsigned char *domainname)
	if (!cp)		if (!cp)
	break;		break;
	if (*domainname != '/' \|\|		if (*domainname != '/' \|\|
	!tomoyo_correct_word2(domainname, cp - domainname - 1))		!tomoyo_correct_word2(domainname, cp - domainname))
	goto out;		goto out;
	domainname = cp + 1;		domainname = cp + 1;
	}		}