Commit 25add8cf authored Jan 15, 2012 by Tetsuo Handa Committed by James Morris Jan 18, 2012

TOMOYO: Accept \000 as a valid character.



TOMOYO 2.5 in Linux 3.2 and later handles Unix domain socket's address.
Thus, tomoyo_correct_word2() needs to accept \000 as a valid character, or
TOMOYO 2.5 cannot handle Unix domain's abstract socket address.

Reported-by: Steven Allen <steven@stebalien.com>
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
CC: stable@vger.kernel.org [3.2+]
Signed-off-by: James Morris <jmorris@namei.org>

parent 89879a7e

security/tomoyo/util.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -492,13 +492,13 @@ static bool tomoyo_correct_word2(const char *string, size_t len)
		if (d < '0' \|\| d > '7' \|\| e < '0' \|\| e > '7')
		break;
		c = tomoyo_make_byte(c, d, e);
		if (tomoyo_invalid(c))
		continue; /* pattern is not \000 */
		if (c <= ' ' \|\| c >= 127)
		continue;
		}
		goto out;
		} else if (in_repetition && c == '/') {
		goto out;
		} else if (tomoyo_invalid(c)) {
		} else if (c <= ' ' \|\| c >= 127) {
		goto out;
		}
		}