diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2013-02-04 16:25:25 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2013-02-04 16:25:25 -0500 |
| commit | 308ba8702caad0a9ba22875c43c1dfa4577ce857 (patch) | |
| tree | 73bc974abb502213fa0f36cde59c8d9faa8ff36a /src/backend/utils/adt/enum.c | |
| parent | 90f77d759b5b394ec477f634ba6ece03dbd0574e (diff) | |
| download | postgresql-308ba8702caad0a9ba22875c43c1dfa4577ce857.tar.gz postgresql-308ba8702caad0a9ba22875c43c1dfa4577ce857.zip | |
Prevent execution of enum_recv() from SQL.
This function was misdeclared to take cstring when it should take internal.
This at least allows crashing the server, and in principle an attacker
might be able to use the function to examine the contents of server memory.
The correct fix is to adjust the system catalog contents (and fix the
regression tests that should have caught this but failed to). However,
asking users to correct the catalog contents in existing installations
is a pain, so as a band-aid fix for the back branches, install a check
in enum_recv() to make it throw error if called with a cstring argument.
We will later revert this in HEAD in favor of correcting the catalogs.
Our thanks to Sumit Soni (via Secunia SVCRP) for reporting this issue.
Security: CVE-2013-0255
Diffstat (limited to 'src/backend/utils/adt/enum.c')
| -rw-r--r-- | src/backend/utils/adt/enum.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/backend/utils/adt/enum.c b/src/backend/utils/adt/enum.c index 009c6c3f924..2f6eb2ef157 100644 --- a/src/backend/utils/adt/enum.c +++ b/src/backend/utils/adt/enum.c @@ -14,6 +14,7 @@ #include "postgres.h" #include "catalog/pg_enum.h" +#include "catalog/pg_type.h" #include "fmgr.h" #include "utils/array.h" #include "utils/builtins.h" @@ -99,6 +100,10 @@ enum_recv(PG_FUNCTION_ARGS) char *name; int nbytes; + /* guard against pre-9.3 misdeclaration of enum_recv */ + if (get_fn_expr_argtype(fcinfo->flinfo, 0) == CSTRINGOID) + elog(ERROR, "invalid argument for enum_recv"); + name = pq_getmsgtext(buf, buf->len - buf->cursor, &nbytes); /* must check length to prevent Assert failure within SearchSysCache */ |