From nobody Sat Jul 19 17:09:02 2025 X-Original-To: dev-commits-src-main@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 4bktRg29Fxz624Cn; Sat, 19 Jul 2025 17:09:03 +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 4bktRf6hrvz3G5H; Sat, 19 Jul 2025 17:09:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752944942; 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=NRRPnfGn/Kvx1t8Lfw1iWBmzJuEVj+u+m879lNTVofw=; b=F05hvkBGinofyzbgMNWYB8Be75BFvW/4pijwToPEw3sdT5p+U8aqkO+42LzwVovskE9C6U tGXemcb6fGH2VojNWg/Mf9XPg4EMCswwoL6z+PP7nGUW4NqYfnOqZ7+II1nWFW9VeI1wWa 0+0C3f36KUfTaTURhFyTv3HdCPj4eE1l++IruG/DslnxfK4xCRaFL7jEjxOBL7jCT6du03 wSgqh65eGca03Y5NmsD++HarzN1xaSrqDUI7lBIizFpG+fbsfh7w1GrvtEDoO2HVD9n5qM 5wczLAQdMldXesadM0WpbAj22/KUt1aBhIMr3BakupuufEQl7tMkki98lG5j+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752944942; 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=NRRPnfGn/Kvx1t8Lfw1iWBmzJuEVj+u+m879lNTVofw=; b=GASP6p8XKrrqBdr4u5DexAyFCEEOGBxE5pzSmunakknf3Yps+e54iAxVAiZCcZR6BMhpIl C9XLvsD3MK1Rw/u7VCjE9LrU++mtISCIeDrKKrgu7/CE/czfwtaFtfhKDAZqBNJd2ihDRX hVNJm8e+ybTl+lbtXFBpJdbwezAfbZQ2X7MGe9B8K4bKlbmhlWlxmVezi13mhKQfcZ6FKc Wtshws0yn57yTs1yif4h+dg6AwJ/FOZtkNF7nQq5HCjR0oTdaDuAV1VtJ6/4FSb86uZ7IG EO0AUwHcSXpOt7/ZAyj/Uzoa42XS8t5yohq6lShOIcMFgVqYFR+xUhGgu/c4CQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752944942; a=rsa-sha256; cv=none; b=gTJ2H8yhtgX0ELI5hlwIa0gWEolaOfkYpTcYzHb22bkbWeS7o60o+9fqUlVy708FlmsFof 5XJchGCJ10Ijf14xRujNllBn0uU4/IIZhku/luTYNpS9iXj2GQINqaGYKtrBUmP13FHuuM x7MzOdvJ3Oq/ZW8kkGkCv9RInslz2gJFaCmmQPBZ1v3M6vzUR7yB5mbefnkDluH8idpyrX k8yA2+1823z0S3vTYqOgeiTE3kPvdnKtniEpSoHRbXXkTaA5GVsgEo+cu191LGRCOPdT0J GbycSGzggAJ5+1Pl0yj6QmEBUl1H8R3olWFQfnEdh9s377Dg8RDdPNs0WSSCrg== 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 4bktRf5v6czbyp; Sat, 19 Jul 2025 17:09:02 +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 56JH92Uf065092; Sat, 19 Jul 2025 17:09:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56JH9231065089; Sat, 19 Jul 2025 17:09:02 GMT (envelope-from git) Date: Sat, 19 Jul 2025 17:09:02 GMT Message-Id: <202507191709.56JH9231065089@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: f46e95ae3add - main - if_genet: Plug memory leaks List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: f46e95ae3addc9f7b975c187f71125825a38ffb1 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f46e95ae3addc9f7b975c187f71125825a38ffb1 commit f46e95ae3addc9f7b975c187f71125825a38ffb1 Author: Zhenlei Huang AuthorDate: 2025-07-19 17:07:54 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-19 17:07:54 +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 --- 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 da973a778706..182b5582fb7c 100644 --- a/sys/arm64/broadcom/genet/if_genet.c +++ b/sys/arm64/broadcom/genet/if_genet.c @@ -653,7 +653,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);