git: 31ad232d8565 - stable/14 - Revert "mcast: fix memory leak in imf_purge()"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 26 Aug 2024 15:51:53 UTC
The branch stable/14 has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=31ad232d85656af77726626decce6c2b7fd824f6
commit 31ad232d85656af77726626decce6c2b7fd824f6
Author: Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2023-12-12 18:20:03 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-08-26 15:45:58 +0000
Revert "mcast: fix memory leak in imf_purge()"
This reverts commit fa03d37432caf17d56a931a9e6f5d9b06f102c5b.
This commit caused us to not send IGMP leave messages if the inpcb went
away. In other words: we freed pending packets whenever the socket
closed rather than when the interface (or address) goes away.
Reviewed by: glebius
Sponsored by: Rubicon Communications, LLC ("Netgate")
Differential Revision: https://reviews.freebsd.org/D43032
(cherry picked from commit c196e43243b83840cc9f3d1dadc7dacb3b0f556f)
---
sys/netinet/in_mcast.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/sys/netinet/in_mcast.c b/sys/netinet/in_mcast.c
index 94fc807ccea7..f93c4b0dac8c 100644
--- a/sys/netinet/in_mcast.c
+++ b/sys/netinet/in_mcast.c
@@ -915,8 +915,6 @@ imf_purge(struct in_mfilter *imf)
imf->imf_st[0] = imf->imf_st[1] = MCAST_UNDEFINED;
KASSERT(RB_EMPTY(&imf->imf_sources),
("%s: imf_sources not empty", __func__));
- if (imf->imf_inm != NULL)
- mbufq_drain(&imf->imf_inm->inm_scq);
}
/*