From 403e71558c5a69b344fd0e0593e14bc271256f1d Mon Sep 17 00:00:00 2001
From: Tetsuo Handa <from-tomoyo-users-en@I-love.SAKURA.ne.jp>
Date: Sun, 15 Jan 2012 11:05:59 +0900
Subject: [PATCH] --- yaml --- r: 286076 b: refs/heads/master c:
 25add8cf99c9ec8b8dc0acd8b9241e963fc0d29c h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/security/tomoyo/util.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7f96309ad7cf..32abeeb520c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89879a7eb81f69e6f63bdb2a442fb765c46482c0
+refs/heads/master: 25add8cf99c9ec8b8dc0acd8b9241e963fc0d29c
diff --git a/trunk/security/tomoyo/util.c b/trunk/security/tomoyo/util.c
index 4a9b4b2eb755..867558c98334 100644
--- a/trunk/security/tomoyo/util.c
+++ b/trunk/security/tomoyo/util.c
@@ -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;
 		}
 	}