From nobody Thu Apr 30 05:06:54 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 4g5hwv0dXYz6ZTFh for ; Thu, 30 Apr 2026 05:06:55 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g5hwt62hXz3YCv for ; Thu, 30 Apr 2026 05:06:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777525614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=whVELqa2HHPbyhq/14cLLzSurytjbcP1W3Xp8SNJ/vU=; b=ETPAIA1OzcDrBa+ZVyqSRyB5+4ImHa5hzVk9XnPkRrGvYJT9Qz/+I5cxeCl3eNaO1xagFd LYMNyS50uYX54lfHD6r5vkyxddxeqxgWc/c6/60dVt00l6B2siu5EevDuP6HogNY6Rumj9 2vR/2JNV3k6jIQdttB1Kq5itV1OT8Jle49tqou62XfhzOWGMr9k3wL93O6UP0sHsFS+pxz aj5XxiDUnFxbw9kHRJMVSCU8tJ8q9gCYZPSNGPutAKg8sWFkpW33zkEDh44ugSN3MuCnDh yc4rxvhXI3sdhoNrLcYkyKcX0lyUJJ5oYN6xPHd/an6JzAnxOFxndUuUD50hMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777525614; a=rsa-sha256; cv=none; b=M8zrXSYIor7JI2p+mq0pEMVNt0lKkZK6JJL0hy0ufzbnKCpMkY6T14B+k1JGPqkI1b9PMd TIZqQmE6CjKp6oCNnNP9XW6z1e5zSYoPi7fyq5PJ/Ky6CipMRPvVfteKHoSlU2C/yx9Q1z moW8TRA7zujJnthgOmZY7yNZppcz8A91KnYdnFElCAH11vrUYT7NDtcgI3/UK9S+kvaNpW m5dnggcmzj0FNE57EAdD0w5Hh+Om3ehLeU2Z6bqGJEwFOwjz/wwM6kGHYA1I56O2zAwsS8 zCwY0AvRGH7oGhx5XnGz0D4MUEevAznA8G000ggFZtLrhzxzatgozhlaIwKctg== 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=1777525614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=whVELqa2HHPbyhq/14cLLzSurytjbcP1W3Xp8SNJ/vU=; b=ZN74ubUY/BzhSsvCg2tePJEy8+iu+iGXuF5AOv/eysz8K1G9/YuRDr/QR8kNJKzPW7ewu0 q/oy3SJyYit0cFZgVRDjdpshoSR/CHPC5w0a7P0w7g2RmxfGScivrFb06yHmi1Nf7nWKDR 5qjQCi9uNPRDA7nPWPygG0l3H+Ak/zRNopDfJ6N/rY5GvnYHx1a1UKHvH8J6r8RA4DnJrC V7gSxgpDjJGyPzgDoCeZoz1dbF06hVA+ydJn7ohk0d/WDX+d/W1bE1NCPa91tvGi5LdgUJ gh96z1i0BAVTpE875KyeJXavA4aSeGZqHG9f6xCj/1UH18/kLkI3MopAmeE38Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g5hwt4kvKz1BXh for ; Thu, 30 Apr 2026 05:06:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f2f3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 30 Apr 2026 05:06:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Peter Ganzhorn From: Zhenlei Huang Subject: git: d11419ed37a6 - stable/15 - iflib: Add a missing CURVNET_RESTORE() in the error path 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d11419ed37a61a4896381f91fd942c4fff2e66dd Auto-Submitted: auto-generated Date: Thu, 30 Apr 2026 05:06:54 +0000 Message-Id: <69f2e36e.1f2f3.1f2842e9@gitrepo.freebsd.org> The branch stable/15 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=d11419ed37a61a4896381f91fd942c4fff2e66dd commit d11419ed37a61a4896381f91fd942c4fff2e66dd Author: Peter Ganzhorn AuthorDate: 2026-04-20 16:59:59 +0000 Commit: Zhenlei Huang CommitDate: 2026-04-30 05:05:12 +0000 iflib: Add a missing CURVNET_RESTORE() in the error path Signed-off-by: Peter Ganzhorn Reviewed by: zlei Fixes: 6d49b41ee84b iflib: Add pfil hooks MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/2150 (cherry picked from commit f49f61f19463c21125bb1215cf8e0530f52953e3) --- sys/net/iflib.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 0bea19d75231..f593532bd363 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -2913,8 +2913,10 @@ iflib_rxeof(iflib_rxq_t rxq, qidx_t budget) ri.iri_frags = rxq->ifr_frags; err = ctx->isc_rxd_pkt_get(ctx->ifc_softc, &ri); - if (err) + if (err) { + CURVNET_RESTORE(); goto err; + } rx_pkts += 1; rx_bytes += ri.iri_len; if (sctx->isc_flags & IFLIB_HAS_RXCQ) {