summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2011-09-06 18:35:19 +0000
committerTom Lane2011-09-06 18:37:22 +0000
commit780a342c900fa085e8c065b3282b491de69ab10d (patch)
tree9a0e7304060de97761881f0aac4624ed5349850e
parent6f94280dee9f8b6c511f00a50531b981faa73b54 (diff)
Avoid possibly accessing off the end of memory in examine_attribute().
Since the last couple of columns of pg_type are often NULL, sizeof(FormData_pg_type) can be an overestimate of the actual size of the tuple data part. Therefore memcpy'ing that much out of the catalog cache, as analyze.c was doing, poses a small risk of copying past the end of memory and incurring SIGSEGV. No such crash has been identified in the field, but we've certainly seen the equivalent happen in other code paths, so patch this one all the way back. Per valgrind testing by Noah Misch, though this is not his proposed patch. I chose to use SearchSysCacheCopy1 rather than inventing special-purpose infrastructure for copying only the minimal part of a pg_type tuple.
-rw-r--r--src/backend/commands/analyze.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c
index 7abf75dce6..6b0a4e7054 100644
--- a/src/backend/commands/analyze.c
+++ b/src/backend/commands/analyze.c
@@ -844,12 +844,11 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr)
stats->attrtypmod = attr->atttypmod;
}
- typtuple = SearchSysCache1(TYPEOID, ObjectIdGetDatum(stats->attrtypid));
+ typtuple = SearchSysCacheCopy1(TYPEOID,
+ ObjectIdGetDatum(stats->attrtypid));
if (!HeapTupleIsValid(typtuple))
elog(ERROR, "cache lookup failed for type %u", stats->attrtypid);
- stats->attrtype = (Form_pg_type) palloc(sizeof(FormData_pg_type));
- memcpy(stats->attrtype, GETSTRUCT(typtuple), sizeof(FormData_pg_type));
- ReleaseSysCache(typtuple);
+ stats->attrtype = (Form_pg_type) GETSTRUCT(typtuple);
stats->anl_context = anl_context;
stats->tupattnum = attnum;
@@ -878,7 +877,7 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr)
if (!ok || stats->compute_stats == NULL || stats->minrows <= 0)
{
- pfree(stats->attrtype);
+ heap_freetuple(typtuple);
pfree(stats->attr);
pfree(stats);
return NULL;