Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 30 Apr 2026 05:06:54 +0000
From:      Zhenlei Huang <zlei@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Cc:        Peter Ganzhorn <peter.ganzhorn@gmail.com>
Subject:   git: d11419ed37a6 - stable/15 - iflib: Add a missing CURVNET_RESTORE() in the error path
Message-ID:  <69f2e36e.1f2f3.1f2842e9@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch stable/15 has been updated by zlei:

URL: https://cgit.FreeBSD.org/src/commit/?id=d11419ed37a61a4896381f91fd942c4fff2e66dd

commit d11419ed37a61a4896381f91fd942c4fff2e66dd
Author:     Peter Ganzhorn <peter.ganzhorn@gmail.com>
AuthorDate: 2026-04-20 16:59:59 +0000
Commit:     Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2026-04-30 05:05:12 +0000

    iflib: Add a missing CURVNET_RESTORE() in the error path
    
    Signed-off-by:  Peter Ganzhorn <peter.ganzhorn@gmail.com>
    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) {


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69f2e36e.1f2f3.1f2842e9>