d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ipsec: fix edge case detection in key_do_getnewspi

Browse Source 
The 'count' variable would end up being -1 post loop, while the
following condition would check for 0 instead.

PR:		258849
Reported by:	Herbie.Robinson@stratus.com
Reviewed by:	ae
Sponsored by:	Rubicon Communications, LLC ("Netgate")
Differential Revision:	https://reviews.freebsd.org/D32826
This commit is contained in:
Mateusz Guzik 2021-11-03 15:00:53 +01:00
parent c28e39c3d6
commit 626bd0970a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/netipsec/key.c
View File

@ -5019,7 +5019,7 @@ static uint32_t
key_do_getnewspi(struct sadb_spirange *spirange, struct secasindex *saidx) key_do_getnewspi(struct sadb_spirange *spirange, struct secasindex *saidx)
{ {
uint32_t min, max, newspi, t; uint32_t min, max, newspi, t;
int count = V_key_spi_trycnt; int tries, limit;
/* set spi range to allocate */ /* set spi range to allocate */
if (spirange != NULL) { if (spirange != NULL) {
@ -5047,21 +5047,22 @@ key_do_getnewspi(struct sadb_spirange *spirange, struct secasindex *saidx)
return 0; return 0;
} }
count--; /* taking one cost. */ tries = 1;
newspi = min; newspi = min;
} else { } else {
/* init SPI */ /* init SPI */
newspi = 0; newspi = 0;
limit = atomic_load_int(&V_key_spi_trycnt);
/* when requesting to allocate spi ranged */ /* when requesting to allocate spi ranged */
while (count--) { for (tries = 0; tries < limit; tries++) {
/* generate pseudo-random SPI value ranged. */ /* generate pseudo-random SPI value ranged. */
newspi = min + (key_random() % (max - min + 1)); newspi = min + (key_random() % (max - min + 1));
if (!key_checkspidup(htonl(newspi))) if (!key_checkspidup(htonl(newspi)))
break; break;
} }
if (count == 0 || newspi == 0) { if (tries == limit || newspi == 0) {
ipseclog((LOG_DEBUG, ipseclog((LOG_DEBUG,
"%s: failed to allocate SPI.\n", __func__)); "%s: failed to allocate SPI.\n", __func__));
return 0; return 0;
@ -5070,7 +5071,7 @@ key_do_getnewspi(struct sadb_spirange *spirange, struct secasindex *saidx)
/* statistics */ /* statistics */
keystat.getspi_count = keystat.getspi_count =
(keystat.getspi_count + V_key_spi_trycnt - count) / 2; (keystat.getspi_count + tries) / 2;
return (htonl(newspi)); return (htonl(newspi));
} }