Fix cache flush hazard in cache_record_field_properties().

tglsfdc · tglsfdc · commit fd59974f2da7 · 2013-06-11T17:26:48.000-04:00
We need to increment the refcount on the composite type's cached tuple
descriptor while we do lookups of its column types.  Otherwise a cache
flush could occur and release the tuple descriptor before we're done with
it.  This fails reliably with -DCLOBBER_CACHE_ALWAYS, but the odds of a
failure in a production build seem rather low (since the pfree'd descriptor
typically wouldn't get scribbled on immediately).  That may explain the
lack of any previous reports.  Buildfarm issue noted by Christian Ullrich.

Back-patch to 9.1 where the bogus code was added.
diff --git a/src/backend/utils/cache/typcache.c b/src/backend/utils/cache/typcache.c
@@ -646,6 +646,9 @@ cache_record_field_properties(TypeCacheEntry *typentry)
 			load_typcache_tupdesc(typentry);
 		tupdesc = typentry->tupDesc;
 
+		/* Must bump the refcount while we do additional catalog lookups */
+		IncrTupleDescRefCount(tupdesc);
+
 		/* Have each property if all non-dropped fields have the property */
 		newflags = (TCFLAGS_HAVE_FIELD_EQUALITY |
 					TCFLAGS_HAVE_FIELD_COMPARE);
@@ -669,6 +672,8 @@ cache_record_field_properties(TypeCacheEntry *typentry)
 				break;
 		}
 		typentry->flags |= newflags;
+
+		DecrTupleDescRefCount(tupdesc);
 	}
 	typentry->flags |= TCFLAGS_CHECKED_FIELD_PROPERTIES;
 }

Original file line number	Diff line number	Diff line change
`@@ -646,6 +646,9 @@ cache_record_field_properties(TypeCacheEntry *typentry)`
`646`	`646`	`load_typcache_tupdesc(typentry);`
`647`	`647`	`tupdesc = typentry->tupDesc;`
`648`	`648`
	`649`	`+ /* Must bump the refcount while we do additional catalog lookups */`
	`650`	`+ IncrTupleDescRefCount(tupdesc);`
	`651`	`+`
`649`	`652`	`/* Have each property if all non-dropped fields have the property */`
`650`	`653`	`newflags = (TCFLAGS_HAVE_FIELD_EQUALITY \|`
`651`	`654`	`TCFLAGS_HAVE_FIELD_COMPARE);`
`@@ -669,6 +672,8 @@ cache_record_field_properties(TypeCacheEntry *typentry)`
`669`	`672`	`break;`
`670`	`673`	`}`
`671`	`674`	`typentry->flags \|= newflags;`
	`675`	`+`
	`676`	`+ DecrTupleDescRefCount(tupdesc);`
`672`	`677`	`}`
`673`	`678`	`typentry->flags \|= TCFLAGS_CHECKED_FIELD_PROPERTIES;`
`674`	`679`	`}`