summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Misch <noah@leadboat.com>2016-02-05 20:22:51 -0500
committerNoah Misch <noah@leadboat.com>2016-02-05 20:23:07 -0500
commited6deeb7a0dd9a8636309d0d8f6033db9fcc55ab (patch)
tree12d557eb3b119bb4bf4a521889e389fb018c6273
parent31b792f61448c862bd32dbb4fa9dfd528fda646c (diff)
downloadpostgresql-ed6deeb7a0dd9a8636309d0d8f6033db9fcc55ab.tar.gz
Force certain "pljava" custom GUCs to be PGC_SUSET.
Future PL/Java versions will close CVE-2016-0766 by making these GUCs PGC_SUSET. This PostgreSQL change independently mitigates that PL/Java vulnerability, helping sites that update PostgreSQL more frequently than PL/Java. Back-patch to 9.1 (all supported versions).
-rw-r--r--src/backend/utils/misc/guc.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 406e859ca2..14d016d29a 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -7076,6 +7076,17 @@ init_custom_variable(const char *name,
!process_shared_preload_libraries_in_progress)
elog(FATAL, "cannot create PGC_POSTMASTER variables after startup");
+ /*
+ * Before pljava commit 398f3b876ed402bdaec8bc804f29e2be95c75139
+ * (2015-12-15), two of that module's PGC_USERSET variables facilitated
+ * trivial escalation to superuser privileges. Restrict the variables to
+ * protect sites that have yet to upgrade pljava.
+ */
+ if (context == PGC_USERSET &&
+ (strcmp(name, "pljava.classpath") == 0 ||
+ strcmp(name, "pljava.vmoptions") == 0))
+ context = PGC_SUSET;
+
gen = (struct config_generic *) guc_malloc(ERROR, sz);
memset(gen, 0, sz);