From 91fc2a08830139d9c11b189a2407cfdf113f550f Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Mon, 17 Dec 2018 12:43:48 +0900 Subject: [PATCH] Fix use-after-free bug when renaming constraints This is an oversight from recent commit b13fd344. 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. --- src/backend/commands/tablecmds.c | 4 ++-- src/test/regress/expected/alter_table.out | 2 +- src/test/regress/sql/alter_table.sql | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 8893522e1d0..04795a33a43 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -2828,12 +2828,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 index 37ba3876dca..20f7d926b29 100644 --- a/src/test/regress/expected/alter_table.out +++ b/src/test/regress/expected/alter_table.out @@ -349,7 +349,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 index 56033ae631b..ea94eb8f162 100644 --- a/src/test/regress/sql/alter_table.sql +++ b/src/test/regress/sql/alter_table.sql @@ -258,7 +258,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 -- 2.39.5