From nobody Mon Apr 20 17:03:06 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 4fzsJ01QyBz6Wxb8 for ; Mon, 20 Apr 2026 17:03:12 +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 4fzsHz5J8tz3QZd for ; Mon, 20 Apr 2026 17:03:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776704591; 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=IT8ggiVAxSKPpsbd37tbWtL23jxbEuiEm1Q8b+qBPCU=; b=NG9bNDOiXFK59jkx+HXh/ta6RJWaGDHx6AIjYTMYSQxyb+SLlzZb3N1m5sPCuSYN+WUPbL 1dvZuMcKf2m2QPQZoB102zYx5vj8ULObPIlSvWLkyQLyQtNioPVa9jd91+DhKhzjsbWpPI 2nxBf3Lq33Fd99oNUUGRLgTaInbqxt3xDitl3i4BScPVHqHYOHHjRWazH92F6G5rTHC+v8 lIVhZXkImLc/8lX68Hta9BgWj+jdVn5nAkTeJ1s9Jiwd+I5AWmcWNmZOMrlWSiG/i87X5R 4dOeQPrRWQH48pYfcEQl2krRmdrTYRyjQq0A1BolMQDM6CJDjOb5BChZSTxF7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776704591; a=rsa-sha256; cv=none; b=nWL7GvwEnlrd22MCUMwc0DwPC4QlPg/Hn2lVvmKiA0alo7fg54SnuUEa50d1tGzMEfwyNH KDTYfLJgkvHOJ8IeqQBQYoJX5nTaT4oEiNf7Wchh5fE/SOjxN+6OBF7ccQCSb7v89AUfOI nTvnD4/DoXYCOQ3xYQuigjb1mDAySlsudoXg4AMADz9sHxD7rsA5Z8PXQiqmuJ8V4Wmz5h Du0fNZR90eCyiO442nLi9DKHGvvuzm/HViCN6eF84jA87R2h7pxc1k56duWxxLycgYk2qA dPsK20gGr2KJjhD1OvK+5tmw8mpIBBnBEwu+aXUgfzPHPTi3HDReUsGJL2Zi8A== 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=1776704591; 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=IT8ggiVAxSKPpsbd37tbWtL23jxbEuiEm1Q8b+qBPCU=; b=eWYlgKMqgVMu1ds3CRa+Qq0ynYg3FgZb+6yGP876kNVmOjg2xQoG7KLqgvx4+mQjgxTsai KUQAMS66lRX+/gUYKwtIUnk58kq8r+5n26G/zoCLqh3+g/JeFH3lx9KveTCsQPTZK/7XNl 3/PLNcJK35tEtmFmBv57WwHFA5FdT9P+GVx8z9heiqH7etcAjSSQMT/3kp14Br7JDhuXLK YUGGUIfUR/5dBxgy7+umiKWJPVhX/IAImLh7exJhKF/dz6EB8tNjPyIlJmidHbE0iHGyHH Q6v1ieYEThMM7VYTIT09Taq1vCzZQYx3RPe9Vo9ybLf4nuEu1wy/dW04MIuFJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fzsHz4pfBz15QX for ; Mon, 20 Apr 2026 17:03:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bfd5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 20 Apr 2026 17:03:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Peter Ganzhorn From: Zhenlei Huang Subject: git: f49f61f19463 - main - 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/main X-Git-Reftype: branch X-Git-Commit: f49f61f19463c21125bb1215cf8e0530f52953e3 Auto-Submitted: auto-generated Date: Mon, 20 Apr 2026 17:03:06 +0000 Message-Id: <69e65c4a.3bfd5.579bd428@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f49f61f19463c21125bb1215cf8e0530f52953e3 commit f49f61f19463c21125bb1215cf8e0530f52953e3 Author: Peter Ganzhorn AuthorDate: 2026-04-20 16:59:59 +0000 Commit: Zhenlei Huang CommitDate: 2026-04-20 16:59:59 +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 --- 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 f16355ab1460..0ad805cb7c16 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -2954,8 +2954,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) {