| From 7401bcdc4c44dcb5c5d77cbe48b1d6803999a15d Mon Sep 17 00:00:00 2001 | |
| From: Sasha Levin <sashal@kernel.org> | |
| Date: Fri, 10 Jul 2026 17:32:35 -0700 | |
| Subject: tools/lib/api: Fix potential double-free from fdarray__grow() | |
| From: Namhyung Kim <namhyung@kernel.org> | |
| [ Upstream commit eadce0f46a1d066b812c7e5aa46a33711c78a755 ] | |
| If the realloc for fda->entries succeeds but the realloc for fda->priv | |
| fails, the error path frees the newly allocated entries. | |
| However, fda->entries is neither updated to point to the new entries block | |
| nor cleared to NULL. If realloc moved the allocation to a new block, the | |
| old fda->entries pointer is now freed memory. | |
| When fdarray__exit() is later called to clean up, it executes | |
| free(fda->entries), which would trigger a double-free on that old pointer. | |
| Reported-by: Sashiko Review <sashiko-bot@kernel.org> | |
| Closes: https://lore.kernel.org/linux-perf-users/20260710200150.11FE71F00A3A@smtp.kernel.org | |
| Reviewed-by: Ian Rogers <irogers@google.com> | |
| Signed-off-by: Namhyung Kim <namhyung@kernel.org> | |
| Signed-off-by: Sasha Levin <sashal@kernel.org> | |
| --- | |
| tools/lib/api/fd/array.c | 5 +++-- | |
| 1 file changed, 3 insertions(+), 2 deletions(-) | |
| diff --git a/tools/lib/api/fd/array.c b/tools/lib/api/fd/array.c | |
| index f0f195207fca9..dcb396ab51eb1 100644 | |
| --- a/tools/lib/api/fd/array.c | |
| +++ b/tools/lib/api/fd/array.c | |
| @@ -31,7 +31,8 @@ int fdarray__grow(struct fdarray *fda, int nr) | |
| priv = realloc(fda->priv, psize); | |
| if (priv == NULL) { | |
| - free(entries); | |
| + /* this will be freed by fdarray__exit() */ | |
| + fda->entries = entries; | |
| return -ENOMEM; | |
| } | |
| @@ -50,7 +51,7 @@ struct fdarray *fdarray__new(int nr_alloc, int nr_autogrow) | |
| if (fda != NULL) { | |
| if (fdarray__grow(fda, nr_alloc)) { | |
| - free(fda); | |
| + fdarray__delete(fda); | |
| fda = NULL; | |
| } else { | |
| fda->nr_autogrow = nr_autogrow; | |
| -- | |
| 2.53.0 | |