diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2007-12-11 09:39:38 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-12-14 09:51:06 -0800 |
| commit | aa53617cb1a0083372b4b6440587ca703e4dddaf (patch) | |
| tree | 2e90d39dfb21d86df5dd074f7bea7dcd2c12d7a0 | |
| parent | 7f6f99bcb122a89b29e927f9209836d492adbd63 (diff) | |
TEXTSEARCH: Do not allow zero length patterns in the textsearch infrastructure
[TEXTSEARCH]: Do not allow zero length patterns in the textsearch infrastructure
[ Upstream commit: e03ba84adb62fbc6049325a5bc00ef6932fa5e39 ]
If a zero length pattern is passed then return EINVAL.
Avoids infinite loops (bm) or invalid memory accesses (kmp).
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | lib/textsearch.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/textsearch.c b/lib/textsearch.c index 88c98a2ec8d..be8bda3862f 100644 --- a/lib/textsearch.c +++ b/lib/textsearch.c @@ -7,7 +7,7 @@ * 2 of the License, or (at your option) any later version. * * Authors: Thomas Graf <tgraf@suug.ch> - * Pablo Neira Ayuso <pablo@eurodev.net> + * Pablo Neira Ayuso <pablo@netfilter.org> * * ========================================================================== * @@ -250,7 +250,8 @@ unsigned int textsearch_find_continuous(struct ts_config *conf, * the various search algorithms. * * Returns a new textsearch configuration according to the specified - * parameters or a ERR_PTR(). + * parameters or a ERR_PTR(). If a zero length pattern is passed, this + * function returns EINVAL. */ struct ts_config *textsearch_prepare(const char *algo, const void *pattern, unsigned int len, gfp_t gfp_mask, int flags) @@ -259,6 +260,9 @@ struct ts_config *textsearch_prepare(const char *algo, const void *pattern, struct ts_config *conf; struct ts_ops *ops; + if (len == 0) + return ERR_PTR(-EINVAL); + ops = lookup_ts_algo(algo); #ifdef CONFIG_KMOD /* |