git: 7f387adb6996 - stable/14 - ipsec esp: avoid dereferencing freed secasindex
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 04 Mar 2024 00:27:46 UTC
The branch stable/14 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=7f387adb6996c8fe93a280b97048d41bfd0daa1f
commit 7f387adb6996c8fe93a280b97048d41bfd0daa1f
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-02-25 10:30:48 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-03-04 00:27:17 +0000
ipsec esp: avoid dereferencing freed secasindex
(cherry picked from commit 1a56620b7958cac2b9048589cb730c46958ab539)
---
sys/netipsec/xform_esp.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/sys/netipsec/xform_esp.c b/sys/netipsec/xform_esp.c
index 16f7b24375fa..7ad6085db87f 100644
--- a/sys/netipsec/xform_esp.c
+++ b/sys/netipsec/xform_esp.c
@@ -508,6 +508,13 @@ esp_input_cb(struct cryptop *crp)
xd = crp->crp_opaque;
CURVNET_SET(xd->vnet);
sav = xd->sav;
+ if (sav->state >= SADB_SASTATE_DEAD) {
+ /* saidx is freed */
+ DPRINTF(("%s: dead SA %p spi %#x\n", __func__, sav, sav->spi));
+ ESPSTAT_INC(esps_notdb);
+ error = ESRCH;
+ goto bad;
+ }
skip = xd->skip;
protoff = xd->protoff;
cryptoid = xd->cryptoid;