From nobody Wed Mar 4 01:20:20 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fQZbm75GJz6Tvcd for ; Wed, 04 Mar 2026 01:20:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fQZbm5DPtz3LK4 for ; Wed, 04 Mar 2026 01:20:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772587220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yW+ogvKMacz0No/LvzXlL2ECj9glJqzYAXPz7iDXgvE=; b=EFqIfEfUx9ck9cHHIVXH5ZeNmeS75hV4/Excfgozl2WQNQm12sWEC7g3VRU/1Cqj9//hax d5tNQGbDYhsqZjM1QafBXdigDDI7o42Gz0cd++9nFb9Wh2DWh8azwx85Gs9NVZI++qKlaJ fwSg011i6narxNGtD83NUeF+PVi854yLGell8HXurYFFRv03v8KE+OV6YeWg6ogtbTexVU 2Imfd/UM53LbPUi1yhfdaRadlvwC30560LwVvrgAMXx+PCxGJhvQQgi/Zx7Ed+swpjQYgr wjSXbl9d4D+l7JbYoRmUJ7GMqdlVB8sdNoDHcyAF7W1ZYLUKM6qQcopLxALjEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772587220; a=rsa-sha256; cv=none; b=vuHOkBJUFdDq9Hmbm7xhw6cqPfffw2IIBJJI7YYwSr3BSCgw5aRsO3KImRYtCBsGx/ih5e 4qjYqB9OC7vFk7BfLPxUtaOIyYMMpc4SQZJ6wVPGu2OvfTN4BCez1Y2TtQUy9TYQeu8sZa DStkusSWvOpk7QZEr+DNTMd29u4Ay8V82pUhYP223hjLmBhJPLfsHcSuF0NoEy3bh7mGbj VwPKdAGp2DHKh6kKNnt88me5ylpG4SnHuHveVAk8sfhrFZCTzuAQk5U5U87ErcAuy9k2oj EmTni8EO9zkQTuMKdE1d++ot13x8xE+cdDEp47nplzlpKM+f+CAHZzzsw5rKCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772587220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yW+ogvKMacz0No/LvzXlL2ECj9glJqzYAXPz7iDXgvE=; b=iMTs+kz+JyXSA2lQZwv2WNZY9mdcGPmRE/PPsyf+mws0PudjcSqkaQZD2uA4d16OUdRsNd FRoP2SSz2mkEPbA734QZWS8zzpBNTQfm5oEM8eVF5Poo46wLdDhQ5HSvBLdGfG1/+N9aes qodo5Hf582clPP8AxrLw8gaH1gP+fbfo8oZloYu3NMYF5OFV8DRK3ze4pSJFRZw07HQDHz MDjN2DHCMidS2ILFKHWH9+0SQ5rBrrMe6DpIzI/ntA3RP/Cx1ZcuT7B21WGbCIbg1/+39P Ew/kI6C/12ALMBNzDOxa39yGH5vR7ard3rLOBPPNeizJLWmiYmjnKODzGuEUTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fQZbm4SDpzTHr for ; Wed, 04 Mar 2026 01:20:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18479 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Mar 2026 01:20:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: cda061006a3f - stable/15 - netipsec/ipsec_offload.c: handle failures to install SA nicely List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cda061006a3f84557c7f958049edfdd0985081e6 Auto-Submitted: auto-generated Date: Wed, 04 Mar 2026 01:20:20 +0000 Message-Id: <69a788d4.18479.70f6e1e5@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cda061006a3f84557c7f958049edfdd0985081e6 commit cda061006a3f84557c7f958049edfdd0985081e6 Author: Konstantin Belousov AuthorDate: 2026-01-27 01:00:36 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-04 01:15:59 +0000 netipsec/ipsec_offload.c: handle failures to install SA nicely (cherry picked from commit 477f020c7b5453bcd3bff7f1491e9830027b271e) --- sys/netipsec/ipsec_offload.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/sys/netipsec/ipsec_offload.c b/sys/netipsec/ipsec_offload.c index 3583fc50f51b..09c57d0a54cc 100644 --- a/sys/netipsec/ipsec_offload.c +++ b/sys/netipsec/ipsec_offload.c @@ -308,23 +308,38 @@ ipsec_accel_sa_newkey_cb(if_t ifp, void *arg) dprintf("ipsec_accel_sa_newkey: driver " "refused sa if %s spi %#x\n", if_name(ifp), be32toh(tq->sav->spi)); - error = ipsec_accel_handle_sav(tq->sav, - ifp, drv_spi, priv, IFP_HS_REJECTED, NULL); - /* XXXKIB */ } else { dprintf("ipsec_accel_sa_newkey: driver " "error %d if %s spi %#x\n", error, if_name(ifp), be32toh(tq->sav->spi)); - /* XXXKIB */ + } + error = ipsec_accel_handle_sav(tq->sav, ifp, drv_spi, priv, + IFP_HS_REJECTED, NULL); + if (error != 0) { + dprintf("ipsec_accel_sa_newkey: handle_sav REJECTED " + "err %d if %s spi %#x\n", error, + if_name(ifp), be32toh(tq->sav->spi)); + free_unr(drv_spi_unr, drv_spi); } } else { error = ipsec_accel_handle_sav(tq->sav, ifp, drv_spi, priv, IFP_HS_HANDLED, NULL); if (error != 0) { - /* XXXKIB */ - dprintf("ipsec_accel_sa_newkey: handle_sav " + dprintf("ipsec_accel_sa_newkey: handle_sav HANDLED " "err %d if %s spi %#x\n", error, if_name(ifp), be32toh(tq->sav->spi)); + error = ifp->if_ipsec_accel_m->if_sa_deinstall(ifp, + drv_spi, priv); + if (error == 0) + free_unr(drv_spi_unr, drv_spi); + /* + * If driver refused to deinstall the SA, keep + * drv_spi leaked so that it is not reused. + * The SA is still programmed into the + * hardware with the drv_spi ident, so it is + * better to leak the drv_spi then reuse for + * another SA and have issues due to aliasing. + */ } } out: