Fix use-after-free bug when renaming constraints

michaelpq · michaelpq · commit 67915fb8e516 · 2018-12-17T12:43:00.000+09:00
This is an oversight from recent commit b13fd34. While on it, tweak the previous test with a better name for the renamed primary key. Detected by buildfarm member prion which forces relation cache release with -DRELCACHE_FORCE_RELEASE. Back-patch down to 9.4 as the previous commit.
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
@@ -3020,12 +3020,12 @@ rename_constraint_internal(Oid myrelid,
 
 	if (targetrelation)
 	{
-		relation_close(targetrelation, NoLock); /* close rel but keep lock */
-
 		/*
 		 * Invalidate relcache so as others can see the new constraint name.
 		 */
 		CacheInvalidateRelcache(targetrelation);
+
+		relation_close(targetrelation, NoLock); /* close rel but keep lock */
 	}
 
 	return address;
diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out
@@ -400,7 +400,7 @@ CREATE TABLE constraint_rename_cache (a int,
 ALTER TABLE constraint_rename_cache
   RENAME CONSTRAINT chk_a TO chk_a_new;
 ALTER TABLE constraint_rename_cache
-  RENAME CONSTRAINT constraint_rename_cache_pkey TO chk_a_gt_zero;
+  RENAME CONSTRAINT constraint_rename_cache_pkey TO constraint_rename_pkey_new;
 CREATE TABLE like_constraint_rename_cache
   (LIKE constraint_rename_cache INCLUDING ALL);
 \d like_constraint_rename_cache
diff --git a/src/test/regress/sql/alter_table.sql b/src/test/regress/sql/alter_table.sql
@@ -296,7 +296,7 @@ CREATE TABLE constraint_rename_cache (a int,
 ALTER TABLE constraint_rename_cache
   RENAME CONSTRAINT chk_a TO chk_a_new;
 ALTER TABLE constraint_rename_cache
-  RENAME CONSTRAINT constraint_rename_cache_pkey TO chk_a_gt_zero;
+  RENAME CONSTRAINT constraint_rename_cache_pkey TO constraint_rename_pkey_new;
 CREATE TABLE like_constraint_rename_cache
   (LIKE constraint_rename_cache INCLUDING ALL);
 \d like_constraint_rename_cache

Original file line number	Diff line number	Diff line change
`@@ -3020,12 +3020,12 @@ rename_constraint_internal(Oid myrelid,`
`3020`	`3020`
`3021`	`3021`	`if (targetrelation)`
`3022`	`3022`	`{`
`3023`		`- relation_close(targetrelation, NoLock); /* close rel but keep lock */`
`3024`		`-`
`3025`	`3023`	`/*`
`3026`	`3024`	`* Invalidate relcache so as others can see the new constraint name.`
`3027`	`3025`	`*/`
`3028`	`3026`	`CacheInvalidateRelcache(targetrelation);`
	`3027`	`+`
	`3028`	`+ relation_close(targetrelation, NoLock); /* close rel but keep lock */`
`3029`	`3029`	`}`
`3030`	`3030`
`3031`	`3031`	`return address;`