From: Richard Guo <rguo@postgresql.org>
Date: Wed, 26 Mar 2025 08:46:51 +0000 (+0900)
Subject: Fix integer-overflow problem in scram_SaltedPassword()
X-Git-Tag: REL_18_BETA1~436
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c82b4f711877b175142bb2b2a6e2c2ee2429441;p=thirdparty%2Fpostgresql.git

Fix integer-overflow problem in scram_SaltedPassword()

Setting the iteration count for SCRAM secret generation to INT_MAX
will cause an infinite loop in scram_SaltedPassword() due to integer
overflow, as the loop uses the "i <= iterations" comparison.  To fix,
use "i < iterations" instead.

Back-patch to v16 where the user-settable GUC scram_iterations has
been added.

Author: Kevin K Biju <kevinkbiju@gmail.com>
Reviewed-by: Richard Guo <guofenglinux@gmail.com>
Reviewed-by: Michael Paquier <michael@paquier.xyz>
Discussion: https://postgr.es/m/CAM45KeEMm8hnxdTOxA98qhfZ9CzGDdgy3mxgJmy0c+2WwjA6Zg@mail.gmail.com
---

diff --git a/src/common/scram-common.c b/src/common/scram-common.c
index 400900c51c5..bfd2a340016 100644
--- a/src/common/scram-common.c
+++ b/src/common/scram-common.c
@@ -74,7 +74,7 @@ scram_SaltedPassword(const char *password,
 	memcpy(result, Ui_prev, key_length);
 
 	/* Subsequent iterations */
-	for (i = 2; i <= iterations; i++)
+	for (i = 1; i < iterations; i++)
 	{
 #ifndef FRONTEND
 		/*