mirror of
https://github.com/postgres/postgres.git
synced 2025-07-27 12:41:57 +03:00
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
This commit is contained in:
@ -8,6 +8,7 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include "ltree.h"
|
||||
#include "utils/memutils.h"
|
||||
#include "crc32.h"
|
||||
|
||||
PG_FUNCTION_INFO_V1(ltree_in);
|
||||
@ -64,6 +65,11 @@ ltree_in(PG_FUNCTION_ARGS)
|
||||
ptr += charlen;
|
||||
}
|
||||
|
||||
if (num + 1 > MaxAllocSize / sizeof(nodeitem))
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
|
||||
errmsg("number of levels (%d) exceeds the maximum allowed (%d)",
|
||||
num + 1, (int) (MaxAllocSize / sizeof(nodeitem)))));
|
||||
list = lptr = (nodeitem *) palloc(sizeof(nodeitem) * (num + 1));
|
||||
ptr = buf;
|
||||
while (*ptr)
|
||||
@ -228,6 +234,11 @@ lquery_in(PG_FUNCTION_ARGS)
|
||||
}
|
||||
|
||||
num++;
|
||||
if (num > MaxAllocSize / ITEMSIZE)
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
|
||||
errmsg("number of levels (%d) exceeds the maximum allowed (%d)",
|
||||
num, (int) (MaxAllocSize / ITEMSIZE))));
|
||||
curqlevel = tmpql = (lquery_level *) palloc0(ITEMSIZE * num);
|
||||
ptr = buf;
|
||||
while (*ptr)
|
||||
|
Reference in New Issue
Block a user