diff options
| author | Noah Misch | 2014-02-17 14:33:31 +0000 |
|---|---|---|
| committer | Noah Misch | 2014-02-17 14:33:32 +0000 |
| commit | 7a362a176a5c6621b58fb3897b2a4cb15b975810 (patch) | |
| tree | b6c052e2e69fe1424ee0e0868aa609fe2da28ebb /contrib/ltree/ltree.h | |
| parent | e4a4fa22352b062bc3548c91fa9bfc6caed7b073 (diff) | |
Predict integer overflow to avoid buffer overruns.
Several functions, mostly type input functions, calculated an allocation
size such that the calculation wrapped to a small positive value when
arguments implied a sufficiently-large requirement. Writes past the end
of the inadvertent small allocation followed shortly thereafter.
Coverity identified the path_in() vulnerability; code inspection led to
the rest. In passing, add check_stack_depth() to prevent stack overflow
in related functions.
Back-patch to 8.4 (all supported versions). The non-comment hstore
changes touch code that did not exist in 8.4, so that part stops at 9.0.
Noah Misch and Heikki Linnakangas, reviewed by Tom Lane.
Security: CVE-2014-0064
Diffstat (limited to 'contrib/ltree/ltree.h')
| -rw-r--r-- | contrib/ltree/ltree.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/ltree/ltree.h b/contrib/ltree/ltree.h index 563970a67a4..1b1305b4839 100644 --- a/contrib/ltree/ltree.h +++ b/contrib/ltree/ltree.h @@ -5,6 +5,7 @@ #include "fmgr.h" #include "tsearch/ts_locale.h" +#include "utils/memutils.h" typedef struct { @@ -111,6 +112,8 @@ typedef struct #define HDRSIZEQT MAXALIGN(VARHDRSZ + sizeof(int32)) #define COMPUTESIZE(size,lenofoperand) ( HDRSIZEQT + (size) * sizeof(ITEM) + (lenofoperand) ) +#define LTXTQUERY_TOO_BIG(size,lenofoperand) \ + ((size) > (MaxAllocSize - HDRSIZEQT - (lenofoperand)) / sizeof(ITEM)) #define GETQUERY(x) (ITEM*)( (char*)(x)+HDRSIZEQT ) #define GETOPERAND(x) ( (char*)GETQUERY(x) + ((ltxtquery*)x)->size * sizeof(ITEM) ) |