From nobody Wed Mar 04 01:20:20 2026 X-Original-To: dev-commits-src-all@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 4fQZbt3RSMz6Tvcm for ; Wed, 04 Mar 2026 01:20:26 +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 4fQZbs58DFz3LPP for ; Wed, 04 Mar 2026 01:20:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772587225; 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=Sn/lmoHrhg/9dZ4UV4t7dB8IrHXj0g9PIiesuh/avk9s196BWFcAmksgSX0GQdQbYg9X2b bJfsPGi9xeQaghqYVsajQGjgSzRI/bDYCwXyoxO7E5sWoqT5Nbrlsk3qHd7N+KShZ84EaO GN+JrUDfa+2lt2eV8xloAK+cjFJtJ3S0V8+TBkZHOTFG8jXf+zrhOxn6DSQjXKklU4PMAV UPnoE80zyCMk2imXpWjM9wdqdVEQbhMvBk8G24T7HR1Aqw5Hbg3CuoOfY7naIxx937W8pj WwQCDnbJY3zcEH9L1LJpe6pNZtUn2eFzAsCXwn6k8LMGjMHRMeuCKxi1S/pM+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772587225; a=rsa-sha256; cv=none; b=slT0fWQT7jvoPWQRixLGpdnyeUTGi3kU4oGZFPnG+TJXVR8uahUUvkw7PFjrlcBC3IL5/F Mb83ZP/+31BnD3HrjtGMVBDuHUZx7VmUvgin4Yyan3Wgi2tvK+YH1WGlOFnMxiuLT9fgN8 69EffKeEs2svSRMg16CEFu0Nq5vdqIzWTbpXbX4v/uYB2ZxMO6gLunUqmXPMVGo6e7/qwS gwVKe6QnPyeXdr9C76TuKYtAi6yeVvYEsshEMYwliRz9kyTpb2leJVe+FztJsUKKdrX+xs M49w6bgLyC4y2I641YhTM3clt1po9B8NJK++HV+mzVYHa1JIQ8OSzL1aqywzvg== 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=1772587225; 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=eoqmVnrjWgEGtuMd1Y7WQ3rLeF1JE3N8w7RyBknWQC7Idem7HCHDmYBm0BAU/SrnGwaUdl Lk+up7D/R8byYpVEuGDM7iCc0buOPnyO95DcnW+NaTxryB8sAjjQ2lj8phsnxLRYPhi+Xy cLzmNm/AiOpQxCnGlbhWHCStz4Hc2xSospw4eq6ScHtIGX85nztcIUne7C+GRg/OHgXSDV 72ppFAk7l1aB+O4AyHPoRKMKjTYkDtg3AE23awJhXg7o2nXZvjUWOucfSCwB2x+ke1Crgp NSBC547s70ewxzZR4vlntzcUxcj60cOHdD5JMjtikW0bj/VvwpcdNl0hFoXJyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fQZbs3vq7zDQf for ; Wed, 04 Mar 2026 01:20:25 +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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: