adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[TEXTSEARCH]: Do not allow zero length patterns in the textsearch infrastructure

Browse source 
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>
This commit is contained in:
Pablo Neira Ayuso 2007-12-01 00:03:52 +11:00 committed by Herbert Xu
parent 67b4af2970
commit e03ba84adb
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/textsearch.c
View file

@ -7,7 +7,7 @@
* 2 of the License, or (at your option) any later version. * 2 of the License, or (at your option) any later version.
* *
* Authors: Thomas Graf <tgraf@suug.ch> * 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. * the various search algorithms.
* *
* Returns a new textsearch configuration according to the specified * 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, struct ts_config *textsearch_prepare(const char *algo, const void *pattern,
unsigned int len, gfp_t gfp_mask, int flags) 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_config *conf;
struct ts_ops *ops; struct ts_ops *ops;
if (len == 0)
return ERR_PTR(-EINVAL);
ops = lookup_ts_algo(algo); ops = lookup_ts_algo(algo);
#ifdef CONFIG_KMOD #ifdef CONFIG_KMOD
/* /*