Fix memory leak when rejecting bogus DH parameters.

tglsfdc · tglsfdc · commit 8c830148d2d4 · 2021-03-20T12:47:48.000-04:00
While back-patching e0e569e, I noted that there were some other places where we ought to be applying DH_free(); namely, where we load some DH parameters from a file and then reject them as not being sufficiently secure. While it seems really unlikely that anybody would hit these code paths in production, let alone do so repeatedly, let's fix it for consistency. Back-patch to v10 where this code was introduced. Discussion: https://postgr.es/m/16160-18367e56e9a28264@postgresql.org
diff --git a/src/backend/libpq/be-secure-openssl.c b/src/backend/libpq/be-secure-openssl.c
@@ -814,13 +814,15 @@ load_dh_file(char *filename, bool isServerStart)
 				(errcode(ERRCODE_CONFIG_FILE_ERROR),
 				 errmsg("invalid DH parameters: %s",
 						SSLerrmessage(ERR_get_error()))));
+		DH_free(dh);
 		return NULL;
 	}
 	if (codes & DH_CHECK_P_NOT_PRIME)
 	{
 		ereport(isServerStart ? FATAL : LOG,
 				(errcode(ERRCODE_CONFIG_FILE_ERROR),
 				 errmsg("invalid DH parameters: p is not prime")));
+		DH_free(dh);
 		return NULL;
 	}
 	if ((codes & DH_NOT_SUITABLE_GENERATOR) &&
@@ -829,6 +831,7 @@ load_dh_file(char *filename, bool isServerStart)
 		ereport(isServerStart ? FATAL : LOG,
 				(errcode(ERRCODE_CONFIG_FILE_ERROR),
 				 errmsg("invalid DH parameters: neither suitable generator or safe prime")));
+		DH_free(dh);
 		return NULL;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -814,13 +814,15 @@ load_dh_file(char *filename, bool isServerStart)`
`814`	`814`	`(errcode(ERRCODE_CONFIG_FILE_ERROR),`
`815`	`815`	`errmsg("invalid DH parameters: %s",`
`816`	`816`	`SSLerrmessage(ERR_get_error()))));`
	`817`	`+ DH_free(dh);`
`817`	`818`	`return NULL;`
`818`	`819`	`}`
`819`	`820`	`if (codes & DH_CHECK_P_NOT_PRIME)`
`820`	`821`	`{`
`821`	`822`	`ereport(isServerStart ? FATAL : LOG,`
`822`	`823`	`(errcode(ERRCODE_CONFIG_FILE_ERROR),`
`823`	`824`	`errmsg("invalid DH parameters: p is not prime")));`
	`825`	`+ DH_free(dh);`
`824`	`826`	`return NULL;`
`825`	`827`	`}`
`826`	`828`	`if ((codes & DH_NOT_SUITABLE_GENERATOR) &&`
`@@ -829,6 +831,7 @@ load_dh_file(char *filename, bool isServerStart)`
`829`	`831`	`ereport(isServerStart ? FATAL : LOG,`
`830`	`832`	`(errcode(ERRCODE_CONFIG_FILE_ERROR),`
`831`	`833`	`errmsg("invalid DH parameters: neither suitable generator or safe prime")));`
	`834`	`+ DH_free(dh);`
`832`	`835`	`return NULL;`
`833`	`836`	`}`
`834`	`837`