From nobody Tue Jul 22 04:05:51 2025 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 4bmNwb62vbz62Nc9; Tue, 22 Jul 2025 04:05:51 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bmNwb2SnSz3jhL; Tue, 22 Jul 2025 04:05:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753157151; 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=OfSxD4Jyfy9utTnlWGD17IsZ4gJnq5E/UzXzzVs3+iU=; b=bjSgPNLK3znVrHMn3ufuaMrBEwQosYqUTe79Gk75VkBkTIaRSfkKnMtX+79uPmGfUifj8L YaW08sx7rvM/+iD5rf+9QeowTGWpBGUazRHFBlwIPjFPgB6N10ifUqHTIm6hKxUD8TwqMo /fMTdl03y+ojvBeQdNUhfSpF0oMqh4o7Er40VWNLTVxjXyTO7DK43hjJ5h6I6hbGmorPtZ 4Hdg0cYySHl+b9BQnyuAGYT7Q0F2hEvwF6F3Y2KVKvq1gEuiMdAo3zDE2PeJr+ftPgxTGB UptQoEWqcNAbnkaDQriLtNJyeoTfZMggIjGaoLgE0RKQXeurvMg1Mg1GfHkjbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753157151; 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=OfSxD4Jyfy9utTnlWGD17IsZ4gJnq5E/UzXzzVs3+iU=; b=LusYJ7pIMB1aBTZlY7T+EiC8VmBuWKw8T0mIUxKtSlXoImrOYaEHrTzonCS4hKLuZ1Kqq4 RN9uB0kS3znWQOVdZf4UyWSQcK/U3AlzcgYHi9YUlinuT9UabmBvqc3ae3LMDHgk5XQ+Dw 2kzdWS/yVr3wjc+6XUsIsbDtqj9vwevlUQZw6d3Ml5nUsly5PGnDDBBLNVgm/XYJqHZQrQ MqAELfYfmYixh+abquQNiv5f0iEZrNYgEhzcCiK5RthuWcHCrTvb7MmM0s6SEJKxbkWali mIEhuYYNShL9zV5MZypmSxDKlgHdX4x+m01F9o3YdioRs52/tM3lrFDZW8X+kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753157151; a=rsa-sha256; cv=none; b=EI5IMsp7bMaJ//04PcewdjzCspdbV3uL+B97u5vDjYwiO4sil7To5RO95W+tEMMj4vBeYP opP1YSn/htnmjKbCiFx6YEr/ms36M29e/IN9hGgex7YDmn8zWsD8sVSAHkdErR8E5boOD4 R0ZlbTnEefoHxbORWd37196PipCwgZZH6WF4BZHLcVpMfh0v1b9EXSynPDopLTrDKFMBhp 2eDaw7Ox2Mxbp/CyVfmFipBEOD+94GCOyp0aRwTAFBVkoSKTi73xEalw6w9682r48ECS7e /Lm7L+LWN/0zD2l1vidmEkhLMtSAcGTFRtKbQLtI0RO2PkPmYDr0nzpz/161hA== 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 4bmNwb1szSz1Pxt; Tue, 22 Jul 2025 04:05:51 +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 56M45pta041340; Tue, 22 Jul 2025 04:05:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56M45pv1041337; Tue, 22 Jul 2025 04:05:51 GMT (envelope-from git) Date: Tue, 22 Jul 2025 04:05:51 GMT Message-Id: <202507220405.56M45pv1041337@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 337c3e9859e7 - stable/14 - if_genet: Plug memory leaks 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/14 X-Git-Reftype: branch X-Git-Commit: 337c3e9859e7b5d971e84bf546a51c2cf9a9e44f Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=337c3e9859e7b5d971e84bf546a51c2cf9a9e44f commit 337c3e9859e7b5d971e84bf546a51c2cf9a9e44f Author: Zhenlei Huang AuthorDate: 2025-07-19 17:07:54 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-22 04:04:51 +0000 if_genet: Plug memory leaks The rx_buf_tag should be checked when destroying rx dma mappings. PR: 288309 Reviewed by: zlei Submitted by: Mike Belanger MFC after: 3 days (cherry picked from commit f46e95ae3addc9f7b975c187f71125825a38ffb1) --- sys/arm64/broadcom/genet/if_genet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/broadcom/genet/if_genet.c b/sys/arm64/broadcom/genet/if_genet.c index 23fd45857d65..7dab488501c3 100644 --- a/sys/arm64/broadcom/genet/if_genet.c +++ b/sys/arm64/broadcom/genet/if_genet.c @@ -657,7 +657,7 @@ gen_bus_dma_teardown(struct gen_softc *sc) error); } - if (sc->tx_buf_tag != NULL) { + if (sc->rx_buf_tag != NULL) { for (i = 0; i < RX_DESC_COUNT; i++) { error = bus_dmamap_destroy(sc->rx_buf_tag, sc->rx_ring_ent[i].map);