From nobody Sun Nov 09 00:36:21 2025 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 4d3v453tNdz6Ft5d; Sun, 09 Nov 2025 00:36:21 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3v452rhvz3RJD; Sun, 09 Nov 2025 00:36:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762648581; 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=unmlv1RR+QuMprSTzAhdR3Y6ocJt+G+gvR8yhfk7fjY=; b=nqxEp1vabx7aFppHkplzV7N8TZE2EiP+ALfmM4LCB4EWhmev6e6SfPMlkAIg0KZSBDZVbL rKFe4iD2j5uvfHGsr60iJY6X7ll2uiCxJjSQLgcOnZZ7d4sqQN+hXyOwM8OL84v4MLHjAH 324Jti6/fY70KZvWEnV8/TvNMWCuK7ZCXzHvvEvTz9lMfcCBvrd2YHdDy8do9dh8j4ndeE J0qMDntwRnBUjuOJ+oO8J1EMq4oQqIqVe35fjuMuK3yXoP8QJvHSiUaZU1Bwz5s2lJDXkQ ViD24qukVFaFpdTwepwddhTYJXv+ZrG2Evqq4Se0GGu1uWUPIDIxsoqrGNdh7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762648581; 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=unmlv1RR+QuMprSTzAhdR3Y6ocJt+G+gvR8yhfk7fjY=; b=k0FsvYGxDEGm5RHs2OFNNDlSTTH1j9Vq5oWSQ+jMj30fFRDloYs7ABJL6JoSkj+qu6NZYN FULib7VW6tyS6afMaKGV/fHXQl57T8v7QMycgXGM/h7fhVKf9pipD8FvgY6kIOWmdAZBaN gLQeXJE7SnyhC2+iyGDFJcPtmEcdHEAJcChZs2OuBOxrGhTv+Pg9dsmt45xQ4C13rZUJ/O mEuJmNgZPi0Qce8A1ss0/KwOIIcYb6VEbjCZH18Gzz0LRn9MFdt6U0V0uTkEjeQ1DdOn1b XebxXM77JkhQ0v3QLCs+52J22UaMbCSdol3JeWzPVzKKYi0L23H9tjrsy6VIgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762648581; a=rsa-sha256; cv=none; b=mZx5Wlyzyp+6YIvR/hNdh5pb7whM6F8TnMnwah6pFf4NShu4mzbmKuGSxojmddGxCpvvVn IpbTHIA0kW1gH1LRIGwLvQTz4nh6q1PbWl0preZNHQlcuHsRJADGqkbckPQqmTM1nOsa5T C/Oa5YUWOX+qKk8ItR0auCd0XbDQ0TMCCK9rhswCpLesFo9qmNZxHaQTq7NOESjMkzQkFh 7Ez7kAVt4QglcWvrG4M+mEGwU1rDCDRYNPFrMzL+IAO25E7rIJGFIP3+wvSwaBgleAAaw2 dnFJx0GVGUJtou4DPMv1DUre0T96MaRt8tI25rLEtsB/1+Msvb/wzyIAPd4qCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3v45279Pz16wc; Sun, 09 Nov 2025 00:36:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A90aLMA096855; Sun, 9 Nov 2025 00:36:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A90aLn3096852; Sun, 9 Nov 2025 00:36:21 GMT (envelope-from git) Date: Sun, 9 Nov 2025 00:36:21 GMT Message-Id: <202511090036.5A90aLn3096852@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e02ff3003bf6 - stable/15 - ipsec_offload: do not leak drv_spi unr 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: e02ff3003bf631340b4a5c793fbbe020bfc1b703 Auto-Submitted: auto-generated The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e02ff3003bf631340b4a5c793fbbe020bfc1b703 commit e02ff3003bf631340b4a5c793fbbe020bfc1b703 Author: Konstantin Belousov AuthorDate: 2025-10-30 14:50:22 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-09 00:35:52 +0000 ipsec_offload: do not leak drv_spi unr (cherry picked from commit 4accefc998e731581549163cf1a582948b2ad0de) --- sys/netipsec/ipsec_offload.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sys/netipsec/ipsec_offload.c b/sys/netipsec/ipsec_offload.c index 59a107881676..3583fc50f51b 100644 --- a/sys/netipsec/ipsec_offload.c +++ b/sys/netipsec/ipsec_offload.c @@ -289,19 +289,18 @@ ipsec_accel_sa_newkey_cb(if_t ifp, void *arg) be32toh(tq->sav->spi), tq->sav->flags, tq->sav->seq); priv = NULL; drv_spi = alloc_unr(drv_spi_unr); - if (tq->sav->accel_ifname != NULL && - strcmp(tq->sav->accel_ifname, if_name(ifp)) != 0) { - error = ipsec_accel_handle_sav(tq->sav, - ifp, drv_spi, priv, IFP_HS_REJECTED, NULL); - goto out; - } if (drv_spi == -1) { - /* XXXKIB */ dprintf("ipsec_accel_sa_install_newkey: cannot alloc " "drv_spi if %s spi %#x\n", if_name(ifp), be32toh(tq->sav->spi)); return (0); } + if (tq->sav->accel_ifname != NULL && + strcmp(tq->sav->accel_ifname, if_name(ifp)) != 0) { + error = ipsec_accel_handle_sav(tq->sav, + ifp, drv_spi, priv, IFP_HS_REJECTED, NULL); + goto out; + } error = ifp->if_ipsec_accel_m->if_sa_newkey(ifp, tq->sav, drv_spi, &priv); if (error != 0) {