From nobody Fri Jan 28 23:09:39 2022 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 4126C198885D; Fri, 28 Jan 2022 23:09:40 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JltSz6kqnz4lHn; Fri, 28 Jan 2022 23:09:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643411380; 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=9n53h1PudYlujLlAvtX6pc4hEMr/dqCBp5gBms5Qc8o=; b=OdXk8ihMsi6AR0UsraUbCl2eCqsQKuBbJiIsn7HKgGIJKTZ0DYhW5Ca/lZC7NHnNU1zHHy OJXGvc41J7qoH1m+Pn3bTsDSXXl62WLK7KAeqc3PQI4VrHbUUOVzcmfI6c/+nMMc/ZBZHt 7kzEcQuwY/QMUoitwudk6BvxoDpo6f0+AjIB2AXMIw4S34sZlQsSvum//cLwcUXoEijHaa 2Go7Maaab58r1ShHebtoJQxoc4JrMFiFcT3MxGRcoRs2cTnXD37WFbNuicxLi1T/fvDXYU IC3f6bnd2NxZEI0ZrNmjenHBDKE4EDTvOfU8QbNKZs+vMCKdSPZCnztOp8FJwA== 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 B2B072C26; Fri, 28 Jan 2022 23:09:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20SN9dF3066296; Fri, 28 Jan 2022 23:09:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20SN9dSW066295; Fri, 28 Jan 2022 23:09:39 GMT (envelope-from git) Date: Fri, 28 Jan 2022 23:09:39 GMT Message-Id: <202201282309.20SN9dSW066295@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 9dac026822ab - main - dummynet: dn_dequeue() may return NULL 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9dac026822ab57b544ee28b66a00e400b5ca9a99 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643411380; 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=9n53h1PudYlujLlAvtX6pc4hEMr/dqCBp5gBms5Qc8o=; b=QFsEE/PsL6naAxgonUxltQYuyZwYq7Euoo4InoMlxR9aKDhf8DSs8vj33s46zuXOuN6+qH NMN/+E8EP7qTull1BOYfdTt7ykrvw/FqZ2sVfUdSwmJ1LCXcT5ShhAJRyfS3Dg8l4H2NmT RGTr4fTgXgBmow3d5YrlNUR698CPCc+B7nwMK4yOYc79iIoYuGyHvRW2X/bVraU3FUo9Lq laTBcqkHBYuCd4dBv38N9qMNhNXY6qaDHkYsBovIFMhMKtUaj6SDkjIjobaCOd/AHwW151 /XeBdYGUvNxdTPX7GXPy+JRmm8ed0ZJx2OkqnUVxYb1Wj4vSlvhgjfXiCWpYPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643411380; a=rsa-sha256; cv=none; b=aCVVxplSPTGy7h0y05JQPJT0ZsXj0Pab84w0xs+ZbnMZ/YWftyWl/ClOWrA7JAZNU1Jq1o qM5hhcA5xjzBSOGxdmklDUQ8Hfb5Eex5r/IPVmbh8rA3Iv+g8j8H0uDxSf1H7piHVo4+ga 4e4XozGSV14uO1GhZxL8Nz7vGtwlFAHE0+Jdx2EgeTNJjFdZ/oWkpi2srMNQPzABw9+sih sLSn26oSiBe8yNQr7cL9t2e0qbPmqiqvR4cTLrPqFFVSwxmYIAauYXcARoVOKHRIfGxur5 VEr8SraKZlNYOPCpxO66pAW4FYZhOP6YNM/3JH9v4F8bCcaImQp/i7Z4RgNBDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9dac026822ab57b544ee28b66a00e400b5ca9a99 commit 9dac026822ab57b544ee28b66a00e400b5ca9a99 Author: Kristof Provost AuthorDate: 2022-01-28 10:10:04 +0000 Commit: Kristof Provost CommitDate: 2022-01-28 22:09:08 +0000 dummynet: dn_dequeue() may return NULL If there are no more entries, or if we fail to restore the rcvif of a queued mbuf dn_dequeue() can return NULL. Cope with this. Reviewed by: glebius Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D34078 --- sys/netpfil/ipfw/dn_sched_wf2q.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netpfil/ipfw/dn_sched_wf2q.c b/sys/netpfil/ipfw/dn_sched_wf2q.c index 7285df0d1d7d..c8a401193811 100644 --- a/sys/netpfil/ipfw/dn_sched_wf2q.c +++ b/sys/netpfil/ipfw/dn_sched_wf2q.c @@ -243,6 +243,8 @@ wf2qp_dequeue(struct dn_sch_inst *_si) q = HEAP_TOP(sch)->object; alg_fq = (struct wf2qp_queue *)q; m = dn_dequeue(q); + if (m == NULL) + return NULL; heap_extract(sch, NULL); /* Remove queue from heap. */ si->V += (uint64_t)(m->m_pkthdr.len) * si->inv_wsum; alg_fq->S = alg_fq->F; /* Update start time. */