From nobody Thu Nov 06 04:01:13 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 4d27ls5SXjz6FlmD; Thu, 06 Nov 2025 04:01:13 +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 4d27ls4zLCz40VK; Thu, 06 Nov 2025 04:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762401673; 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=vw9oHkVJ7A/JeW4+FBzlxzD2RWMa2HJMvMUA+5BooMg=; b=AQy0TKmnfZY5+aQI1m9ayAc4EaJqeeYWm3I/Z6vi3NZd+ets8X2mdnZQYNFuVuDJVXA6PY t9n3pv+Pq/28xPyykudo1hkChM6pknzQmSawFBTzHnimxrEnWVQQtXShkFHTBDQp8xfYSS R1wxU+88tTSpGMpIYcWN9QSR1Wn6szpTGJoP+y9XMB3PdllkMELbkOfgXBkx52YO6kjMMq e1MWBkycGfcH977wPKc3/8vbmyVLmFbbSO4YEzFXDA47I81bA31bzx6sj22ET4f8OXSPCR Ii1zHhY55WdjsKLTur5Y6Ljypq8VQRImm9RDKrisM1cx6kuDqvG7LzFllAonmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762401673; 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=vw9oHkVJ7A/JeW4+FBzlxzD2RWMa2HJMvMUA+5BooMg=; b=bzDNktfqaVzpXGAmXI419zA8BzVuSwCmoxVWSRlUXuou9iBjlFrnqFwHWFUqlvZa1XoI2l 8m4R8V+9fOmJwAHZfeIGTea5CBPCpmluwbFVxQGqcJYrFGRFTARz0yq8LKLp7X43gqhlu2 LBJ0EsCCeFfxplFRZIix4IZcIgdaZ8KTiTiM8LqOKFbMKv6IMFcmmpI2wSQO66/dYLPyfC beFDCRkpHWKbyTje8bV7pT3CVhZ56tXezaPK0Xbzaa9a5GQwU3V5T1G02kmGSJ8YuUPoAD YMAPQ8ctZnDVKHlenXuLMfsQ544+VPhhJPZMXBA9L1+D9W9xWnoHre8ceHJkVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762401673; a=rsa-sha256; cv=none; b=th/s8OCXqTxXmxUr4oKPEfeR+nZ8XT8APw7/JzaXZitOAI7wRo786UbKGzFiVfoxMiHLqe i8Rlk4VyGBjt1Cr9P49ConmAUexdhFBjwQhR5zgNOtdYoJkJ65DJ6VPW96d3Jtq/2R1R5i EPXM4d5UcUt35vrd/Ogl5DsUQPQQ2Evo2hSy73ZbYB2GXHtGRZCP47zUnTNx1w9oa27TDo ISaWlmMi+tTO8QlHXjqlYIaTYTrzI3wZ1McwEFff/0UbYoxjwHSRpQT+eQNrD3b1uRbYHk 4wpmR42zhLRL9GVWqL9NQoDIA+3TWKxumRJmFeLMIVoukADJ0SYSIvqr8/HvEA== 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 4d27ls4ZZzz1C1T; Thu, 06 Nov 2025 04:01:13 +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 5A641DqN039416; Thu, 6 Nov 2025 04:01:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A641Dvx039413; Thu, 6 Nov 2025 04:01:13 GMT (envelope-from git) Date: Thu, 6 Nov 2025 04:01:13 GMT Message-Id: <202511060401.5A641Dvx039413@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: 0401498ab1ac - stable/15 - ipsec offload: never return error from the newkey/spdadd callbacks 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: 0401498ab1ac8e6e0dbd603c7a31eff1b8efc6da Auto-Submitted: auto-generated The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0401498ab1ac8e6e0dbd603c7a31eff1b8efc6da commit 0401498ab1ac8e6e0dbd603c7a31eff1b8efc6da Author: Konstantin Belousov AuthorDate: 2025-10-29 16:37:17 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-06 04:00:57 +0000 ipsec offload: never return error from the newkey/spdadd callbacks (cherry picked from commit 8b2f4e6b3a478faaa4b0b23efc9c65f5db913df4) --- sys/netipsec/ipsec_offload.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/netipsec/ipsec_offload.c b/sys/netipsec/ipsec_offload.c index 8a09d5f37b4a..59a107881676 100644 --- a/sys/netipsec/ipsec_offload.c +++ b/sys/netipsec/ipsec_offload.c @@ -300,7 +300,7 @@ ipsec_accel_sa_newkey_cb(if_t ifp, void *arg) dprintf("ipsec_accel_sa_install_newkey: cannot alloc " "drv_spi if %s spi %#x\n", if_name(ifp), be32toh(tq->sav->spi)); - return (ENOMEM); + return (0); } error = ifp->if_ipsec_accel_m->if_sa_newkey(ifp, tq->sav, drv_spi, &priv); @@ -329,7 +329,7 @@ ipsec_accel_sa_newkey_cb(if_t ifp, void *arg) } } out: - return (error); + return (0); } static void @@ -663,7 +663,7 @@ ipsec_accel_spdadd_cb(if_t ifp, void *arg) if (error != 0) { dprintf("ipsec_accel_spdadd: %s if_spdadd %p remember res %d\n", if_name(ifp), sp, error); - return (error); + return (0); } error = ifp->if_ipsec_accel_m->if_spdadd(ifp, sp, inp, &i->ifdata); if (error != 0) { @@ -671,7 +671,7 @@ ipsec_accel_spdadd_cb(if_t ifp, void *arg) dprintf("ipsec_accel_spdadd: %s if_spdadd %p res %d\n", if_name(ifp), sp, error); } - return (error); + return (0); } static void