From b82aca89a5b366c4377b3b140e54313e817e8f57 Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Thu, 25 Nov 2021 07:05:06 -0800 Subject: [PATCH] mmap-cache: LIST_REMOVE() *after* w->unused_prev The LIST_REMOVE() macro always assigns NULL to w->unused_prev, meaning every time this window was in last_unused, the remainder of the unused list was lost to the ether. Turns out there's been a memory leak in journald after all, this code has been there since at least 2013... --- src/libsystemd/sd-journal/mmap-cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsystemd/sd-journal/mmap-cache.c b/src/libsystemd/sd-journal/mmap-cache.c index cc02d8c76c..f2f80dfbb2 100644 --- a/src/libsystemd/sd-journal/mmap-cache.c +++ b/src/libsystemd/sd-journal/mmap-cache.c @@ -224,9 +224,9 @@ static void context_attach_window(Context *c, Window *w) { if (w->in_unused) { /* Used again? */ - LIST_REMOVE(unused, c->cache->unused, w); if (c->cache->last_unused == w) c->cache->last_unused = w->unused_prev; + LIST_REMOVE(unused, c->cache->unused, w); w->in_unused = false; }