diff options
| author | Tetsuo Handa <from-tomoyo-users-en@I-love.SAKURA.ne.jp> | 2012-01-15 11:05:59 +0900 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2012-01-18 10:40:59 +1100 |
| commit | 25add8cf99c9ec8b8dc0acd8b9241e963fc0d29c (patch) | |
| tree | 1fb0c0fadcf7544fee117f27ac667e4c444d634b | |
| parent | 89879a7eb81f69e6f63bdb2a442fb765c46482c0 (diff) | |
| download | lwn-25add8cf99c9ec8b8dc0acd8b9241e963fc0d29c.tar.gz lwn-25add8cf99c9ec8b8dc0acd8b9241e963fc0d29c.zip | |
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>
| -rw-r--r-- | security/tomoyo/util.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/security/tomoyo/util.c b/security/tomoyo/util.c index 4a9b4b2eb755..867558c98334 100644 --- a/security/tomoyo/util.c +++ b/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; } } |