Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 460bfd0

Browse files
committed
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.
1 parent 94bf47d commit 460bfd0

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

src/backend/commands/analyze.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -845,12 +845,11 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr)
845845
stats->attrtypmod = attr->atttypmod;
846846
}
847847

848-
typtuple = SearchSysCache1(TYPEOID, ObjectIdGetDatum(stats->attrtypid));
848+
typtuple = SearchSysCacheCopy1(TYPEOID,
849+
ObjectIdGetDatum(stats->attrtypid));
849850
if (!HeapTupleIsValid(typtuple))
850851
elog(ERROR, "cache lookup failed for type %u", stats->attrtypid);
851-
stats->attrtype = (Form_pg_type) palloc(sizeof(FormData_pg_type));
852-
memcpy(stats->attrtype, GETSTRUCT(typtuple), sizeof(FormData_pg_type));
853-
ReleaseSysCache(typtuple);
852+
stats->attrtype = (Form_pg_type) GETSTRUCT(typtuple);
854853
stats->anl_context = anl_context;
855854
stats->tupattnum = attnum;
856855

@@ -879,7 +878,7 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr)
879878

880879
if (!ok || stats->compute_stats == NULL || stats->minrows <= 0)
881880
{
882-
pfree(stats->attrtype);
881+
heap_freetuple(typtuple);
883882
pfree(stats->attr);
884883
pfree(stats);
885884
return NULL;

0 commit comments

Comments
 (0)