diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-02-15 16:24:37 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-15 16:24:37 -0500 |
| commit | ca994a36f585432458ead9133fcfe05440edbb7b (patch) | |
| tree | be05512153a9cd5cbe1f1234bc09fd9cd388ec58 /security/tomoyo/util.c | |
| parent | 12325280dfeba18164f9c47e226a40ab34e23ee7 (diff) | |
| parent | 2504a6423b9ab4c36df78227055995644de19edb (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
net/mac80211/debugfs_sta.c
net/mac80211/sta_info.h
Diffstat (limited to 'security/tomoyo/util.c')
| -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) | |||
| 492 | if (d < '0' || d > '7' || e < '0' || e > '7') | 492 | if (d < '0' || d > '7' || e < '0' || e > '7') |
| 493 | break; | 493 | break; |
| 494 | c = tomoyo_make_byte(c, d, e); | 494 | c = tomoyo_make_byte(c, d, e); |
| 495 | if (tomoyo_invalid(c)) | 495 | if (c <= ' ' || c >= 127) |
| 496 | continue; /* pattern is not \000 */ | 496 | continue; |
| 497 | } | 497 | } |
| 498 | goto out; | 498 | goto out; |
| 499 | } else if (in_repetition && c == '/') { | 499 | } else if (in_repetition && c == '/') { |
| 500 | goto out; | 500 | goto out; |
| 501 | } else if (tomoyo_invalid(c)) { | 501 | } else if (c <= ' ' || c >= 127) { |
| 502 | goto out; | 502 | goto out; |
| 503 | } | 503 | } |
| 504 | } | 504 | } |