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:
@ -9,6 +9,7 @@
|
||||
|
||||
#include "crc32.h"
|
||||
#include "ltree.h"
|
||||
#include "miscadmin.h"
|
||||
|
||||
PG_FUNCTION_INFO_V1(ltxtq_in);
|
||||
Datum ltxtq_in(PG_FUNCTION_ARGS);
|
||||
@ -213,6 +214,9 @@ makepol(QPRS_STATE *state)
|
||||
int4 lenstack = 0;
|
||||
uint16 flag = 0;
|
||||
|
||||
/* since this function recurses, it could be driven to stack overflow */
|
||||
check_stack_depth();
|
||||
|
||||
while ((type = gettoken_query(state, &val, &lenval, &strval, &flag)) != END)
|
||||
{
|
||||
switch (type)
|
||||
@ -277,6 +281,9 @@ makepol(QPRS_STATE *state)
|
||||
static void
|
||||
findoprnd(ITEM *ptr, int4 *pos)
|
||||
{
|
||||
/* since this function recurses, it could be driven to stack overflow. */
|
||||
check_stack_depth();
|
||||
|
||||
if (ptr[*pos].type == VAL || ptr[*pos].type == VALTRUE)
|
||||
{
|
||||
ptr[*pos].left = 0;
|
||||
@ -341,8 +348,12 @@ queryin(char *buf)
|
||||
errmsg("syntax error"),
|
||||
errdetail("Empty query.")));
|
||||
|
||||
/* make finish struct */
|
||||
if (LTXTQUERY_TOO_BIG(state.num, state.sumlen))
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
|
||||
errmsg("ltxtquery is too large")));
|
||||
commonlen = COMPUTESIZE(state.num, state.sumlen);
|
||||
|
||||
query = (ltxtquery *) palloc(commonlen);
|
||||
SET_VARSIZE(query, commonlen);
|
||||
query->size = state.num;
|
||||
|
Reference in New Issue
Block a user