From: Priyank Rathod <rathodpriyank@google.com>
To: Mahesh J Salgaonkar <mahesh@linux.ibm.com>,
"Oliver O'Halloran" <oohall@gmail.com>,
Bjorn Helgaas <bhelgaas@google.com>
Cc: "Lukas Wunner" <lukas@wunner.de>,
"Kuppuswamy Sathyanarayanan"
<sathyanarayanan.kuppuswamy@linux.intel.com>,
"Jonathan Cameron" <jic23@kernel.org>,
"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>,
"Dave Jiang" <dave.jiang@intel.com>,
"Shiju Jose" <shiju.jose@huawei.com>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
linuxppc-dev@lists.ozlabs.org, linux-pci@vger.kernel.org,
linux-kernel@vger.kernel.org,
"Priyank Rathod" <rathodpriyank@google.com>,
stable@vger.kernel.org
Subject: [PATCH v5 0/3] PCI/AER: Fix ghes_estatus_pool memory leaks in error handling
Date: Mon, 28 Sep 2026 17:40:11 +0000 [thread overview]
Message-ID: <20260928-b4-fix-aer-memleaks-v5-0-ba6b94c9c9a6@google.com> (raw)
When firmware reports PCIe Advanced Error Reporting (AER) events via ACPI
APEI GHES (ghes_handle_aer()), it allocates a snapshot buffer from
ghes_estatus_pool to store the aer_capability_regs registers before
enqueuing the error record into aer_recover_ring.
aer_recover_queue() returns void, so ghes_handle_aer() cannot release that
buffer itself; ownership is handed to the AER code, which until now freed
it only on the fully successful path. If the record cannot be enqueued, or
if a dequeued record cannot be mapped to a pci_dev, the allocation is
silently leaked. Under a sustained error storm this exhausts
ghes_estatus_pool, which then breaks GHES hardware error reporting
system-wide.
This series fixes both leak paths and documents the ownership rule:
Patch 1: aer_recover_queue() when kfifo_in_spinlocked() fails because
aer_recover_ring (capacity 16) is full. The rejected entry is
freed immediately via ghes_estatus_pool_region_free().
Patch 2: aer_recover_work_func() when a dequeued entry cannot be mapped to
an active PCI device (pdev is NULL). The loop is restructured so
ghes_estatus_pool_region_free() runs unconditionally for every
dequeued item.
Patch 3: Add a kernel-doc comment stating that aer_recover_queue() takes
ownership of @aer_regs, which must be allocated from
ghes_estatus_pool. This is documentation only, so unlike
patches 1 and 2 it has no Fixes: or Cc: stable tag.
Signed-off-by: Priyank Rathod <rathodpriyank@google.com>
---
Changes in v5:
- Add patch 3, a kernel-doc comment on aer_recover_queue() stating that
it takes ownership of @aer_regs, which must come from ghes_estatus_pool
(suggested by Kuppuswamy Sathyanarayanan). It is a separate patch so
that the two fixes stay minimal for stable backports, and because the
comment is only accurate once patch 2 is applied.
- Add Kuppuswamy's Reviewed-by to patches 1 and 2. Their code is
unchanged from v4.
- Still applies cleanly to pci/next (94e8d4e94266), before or after
Lukas' "Error reporting for AER-incapable devices" series:
https://lore.kernel.org/r/cover.1790531238.git.lukas@wunner.de
- Cc Kuppuswamy Sathyanarayanan, Jonathan Cameron, Ilpo Järvinen and
Dave Jiang, plus Shiju Jose and Rafael J. Wysocki as the author and
committer of the commit in Fixes:.
- Link to v4: https://lore.kernel.org/r/20260918-b4-fix-aer-memleaks-v4-0-f0a2c21ed1d1@google.com
Changes in v4:
- Rebased onto v7.3-rc3+ (f259f446f519); applies cleanly to pci/next as
well. No conflicts with the Advisory Non-Fatal Error support that landed
in the meantime.
- Added missing Fixes: e2abc47a5a1a ("ACPI: APEI: Fix AER info corruption
when error status data has multiple sections") and Cc: stable to both
patches; that commit (v6.7-rc1) introduced the ghes_estatus_pool
allocation whose ownership these paths drop.
- Patch 1: use braces on both arms of the if/else and fix the continuation
alignment (checkpatch --strict).
- Both patches now build warning-free with W=1 and CONFIG_ACPI_APEI_PCIEAER=y
(earlier revisions were only build-tested with APEI disabled, which
compiles neither of the modified functions).
- Explained in both commit messages why the caller cannot free the buffer,
and when the missing-pci_dev path is reachable.
- Cc: Lukas Wunner, who has been active in this code.
- Link to v3: https://lore.kernel.org/r/20260803-b4-fix-aer-memleaks-v3-1-e87159611933@google.com
Changes in v3:
- Resent to fix threading of the series.
- Link to v2: https://lore.kernel.org/r/20260803-b4-fix-aer-memleaks-v2-1-fd199b0171fd@google.com
Changes in v2:
- Refactored aer_recover_work_func() to ensure ghes_estatus_pool_region_free()
is called unconditionally for every dequeued record.
- Added Patch 1 to fix related memory leak in aer_recover_queue() on kfifo
buffer overflow.
- Link to v1: https://lore.kernel.org/r/20260803183853.432459-2-rathodpriyank@google.com
---
Priyank Rathod (3):
PCI/AER: Fix memory leak in aer_recover_queue() on kfifo buffer overflow
PCI/AER: Fix memory leak in aer_recover_work_func() when pci_dev is missing
PCI/AER: Document that aer_recover_queue() takes ownership of aer_regs
drivers/pci/pcie/aer.c | 48 +++++++++++++++++++++++++++++++++++-------------
1 file changed, 35 insertions(+), 13 deletions(-)
---
base-commit: f259f446f5198d98e13756d2cd531812a0ad3064
change-id: 20260803-b4-fix-aer-memleaks-524a1bd5e888
Best regards,
--
Priyank Rathod <rathodpriyank@google.com>
next reply other threads:[~2026-09-28 17:40 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-28 17:40 Priyank Rathod [this message]
2026-09-28 17:40 ` [PATCH v5 1/3] PCI/AER: Fix memory leak in aer_recover_queue() on kfifo buffer overflow Priyank Rathod
2026-09-28 17:40 ` [PATCH v5 2/3] PCI/AER: Fix memory leak in aer_recover_work_func() when pci_dev is missing Priyank Rathod
2026-09-28 17:40 ` [PATCH v5 3/3] PCI/AER: Document that aer_recover_queue() takes ownership of aer_regs Priyank Rathod
2026-10-06 17:13 ` Kuppuswamy Sathyanarayanan
2026-10-05 15:45 ` [PATCH v5 0/3] PCI/AER: Fix ghes_estatus_pool memory leaks in error handling Priyank Rathod
2026-10-05 23:27 ` Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260928-b4-fix-aer-memleaks-v5-0-ba6b94c9c9a6@google.com \
--to=rathodpriyank@google.com \
--cc=bhelgaas@google.com \
--cc=dave.jiang@intel.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=jic23@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=lukas@wunner.de \
--cc=mahesh@linux.ibm.com \
--cc=oohall@gmail.com \
--cc=rafael.j.wysocki@intel.com \
--cc=sathyanarayanan.kuppuswamy@linux.intel.com \
--cc=shiju.jose@huawei.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®