diff options
author | Ondřej Bílka <neleai@seznam.cz> | 2015-07-11 17:44:10 +0200 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2016-02-16 14:16:00 -0500 |
commit | 24772ea8cd098a39bffe623417a2fa15f53d9ec8 (patch) | |
tree | 5a80e122f38213dbb13d38504b0f0574bc1ca9f9 /misc | |
parent | 29c2af3215ff6670058948d1837c786a6884667f (diff) | |
download | glibc-24772ea8cd098a39bffe623417a2fa15f53d9ec8.zip glibc-24772ea8cd098a39bffe623417a2fa15f53d9ec8.tar.gz glibc-24772ea8cd098a39bffe623417a2fa15f53d9ec8.tar.bz2 |
Handle overflow in __hcreate_r
Hi,
As in bugzilla entry there is overflow in hsearch when looking for prime
number as SIZE_MAX - 1 is divisible by 5. We fix that by rejecting large
inputs before looking for prime.
* misc/hsearch_r.c (__hcreate_r): Handle overflow.
(cherry picked from commit 2f5c1750558fe64bac361f52d6827ab1bcfe52bc)
(cherry picked from commit 43f189b0032fbce67fc0c0f4e122e917cd232670)
Diffstat (limited to 'misc')
-rw-r--r-- | misc/hsearch_r.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/misc/hsearch_r.c b/misc/hsearch_r.c index 9f55e84..559df29 100644 --- a/misc/hsearch_r.c +++ b/misc/hsearch_r.c @@ -19,7 +19,7 @@ #include <errno.h> #include <malloc.h> #include <string.h> - +#include <stdint.h> #include <search.h> /* [Aho,Sethi,Ullman] Compilers: Principles, Techniques and Tools, 1986 @@ -73,6 +73,13 @@ __hcreate_r (nel, htab) return 0; } + if (nel >= SIZE_MAX / sizeof (_ENTRY)) + { + __set_errno (ENOMEM); + return 0; + } + + /* There is still another table active. Return with error. */ if (htab->table != NULL) return 0; |