From nobody Fri Oct 2 07:46:35 2026 Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 83BDE2F546D for ; Mon, 3 Aug 2026 21:51:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.199 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785793869; cv=none; b=EKZvFq4LUGZVWZQl4XdNb689D3tkNh4cCR8ayDrFkvNDdAOdbcS61pxHXVmGLO/6VVswPbSLI3/Yjo1IK6lovwoclfxhOYdIMHWfh9I8RvO21C8q88nXbw8SgZcsj3FCt/fiYTPTSClYeudK7OG7trvzbeuEmu33/fIaZ9oTdrA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785793869; c=relaxed/simple; bh=/n1lx7kZVGHY/CjYSQUPtmCH3DR+8LKo5cFZlGTFwfY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=LfD3qgnC+1c++IPhAix+bAnjrCAtz32zMTcb/7theDoxNQrdJJNIzdngAgU+Ostn3vL+ikhcd/XBnQep+fLceby1K9Z0ANjbgeFF6wMPuQDtSu3dqwE1/BPexz7Y+HL1SpnjbT2TWmsUS2e4syHog2y3QyHO+28GD/kjgU6N/5U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--rathodpriyank.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=b/TGiOku; arc=none smtp.client-ip=209.85.210.199 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--rathodpriyank.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="b/TGiOku" Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-848860def2cso4569595b3a.2 for ; Mon, 03 Aug 2026 14:51:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785793868; x=1786398668; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=V3RiD/GImmxOZZ69pO9kk8WyvHse/kOu0dWQ2OD9gW0=; b=b/TGiOkucydAQe9yKgtIaVah7Q4/AFgn9vU98tLqDvblGnkJqMmifMVYbAID0cgj/r Aq9xwJ1K5zuftraxx9Lvzl6BW87241yaydzFctbGBtV2NnJjOMhoymIjEOK+AXs0JesA b7WtJnOX2ySM2zHZE9Rbiz1C3192u29LfLeXv8f71VD/Lt3pMXl+J4B7aMOEtsSc8zTb p4k5iUuJcrBK7MmcXrkaw81cwPF13wQl1qZ8D4HWsNGPl/l1603ojOWjakyDV4o/AQjY TJd7zrdheBIPcdEVZ4YGg7Iz0MGHy0+bctYC9wv9W3hGdp0UZv+ASYXgUS0h4WtY4xGh R+iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785793868; x=1786398668; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=V3RiD/GImmxOZZ69pO9kk8WyvHse/kOu0dWQ2OD9gW0=; b=KphY9PUv2jgXG+EMVneBXZzG+Ue0DbwjRWQl3rEAvXMrOhg8NgV0Ybxwf0Z0yoPoiI +YzDOzgT19wwuDnAudjMhp2xIiX/uekNllA9neLaxmSTZZYrDNc73+EBcbY3PfixoZfP PQfTLKpWXNNnKf6Cx5BHdjhQN7G48fqsMT8zeTQt2Ca0xrOgSnCJ9N37CSAmj1qNPCxi /a2EyJ/4cGYZPOR98CMNTznFYGZGXRv7CzHFd+Hu0nL2WB9NMyu7U3Jej/V5fEHtMp3Q +wmzgdB2U7yxXyR0hBFBR+8oKg7U8nTve8wYaJG0xn2+RGWrdkHlKsFY6WijDCeMsRtb Lq9g== X-Forwarded-Encrypted: i=1; AHgh+RriGBxtqj+vMU4j7b+ZWK5els35rjQ2Tn+KVKJii1IZCGDBSDHol0/MGUq9B9+m1kRbcrGnm4ZLFvCfUVs=@vger.kernel.org X-Gm-Message-State: AOJu0YxzJaGcI9LlN4l0r36PlLZjiVFc/sxKZdWZRb5sH2Dcti+LAcbo Z1KEoxyia8esg4AzEpiIPZeiqxIG4Lt9Am9eEb9PwTH76aCPtJJpisP9KseXlHi+sf2chlxH24e oM0FBHeIUBvgia4jsAMbb0ttzhDERTXZYhQ== X-Received: from pfet15.prod.google.com ([2002:aa7:938f:0:b0:84b:62d1:9fe3]) (user=rathodpriyank job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:4293:b0:848:2ae4:d2ba with SMTP id d2e1a72fcca58-84ee4864ed1mr9846295b3a.28.1785793867656; Mon, 03 Aug 2026 14:51:07 -0700 (PDT) Date: Mon, 03 Aug 2026 21:51:05 +0000 In-Reply-To: <20260803-b4-fix-aer-memleaks-v3-0-e87159611933@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260803-b4-fix-aer-memleaks-v3-0-e87159611933@google.com> X-Mailer: b4 0.14.3 Message-ID: <20260803-b4-fix-aer-memleaks-v3-1-e87159611933@google.com> Subject: [PATCH v3 1/2] PCI/AER: Fix memory leak in aer_recover_queue() on kfifo buffer overflow From: Priyank Rathod To: Mahesh J Salgaonkar , "Oliver O'Halloran" , Bjorn Helgaas Cc: linuxppc-dev@lists.ozlabs.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Priyank Rathod Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable When ACPI APEI/GHES processes PCIe AER error records, it allocates memory for aer_capability_regs (aer_regs) from ghes_estatus_pool and passes it to aer_recover_queue() to be enqueued into aer_recover_ring. If kfifo_in_spinlocked() fails due to a buffer overflow, aer_recover_queue() logged an error message but returned without freeing aer_regs. Because the entry was rejected and never inserted into the queue, aer_recover_work_func() could never dequeue or free it, leaking the allocated ghes_estatus_pool memory. Free aer_regs via ghes_estatus_pool_region_free() when kfifo_in_spinlocked() fails on buffer overflow. Signed-off-by: Priyank Rathod --- drivers/pci/pcie/aer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index c4fd9c0b2a54..967cde9dd519 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -1274,9 +1274,12 @@ void aer_recover_queue(int domain, unsigned int bus,= unsigned int devfn, if (kfifo_in_spinlocked(&aer_recover_ring, &entry, 1, &aer_recover_ring_lock)) schedule_work(&aer_recover_work); - else + else { pr_err("buffer overflow in recovery for %04x:%02x:%02x.%x\n", domain, bus, PCI_SLOT(devfn), PCI_FUNC(devfn)); + ghes_estatus_pool_region_free((unsigned long)aer_regs, + sizeof(struct aer_capability_regs)); + } } EXPORT_SYMBOL_GPL(aer_recover_queue); #endif --=20 2.55.0.571.g244d577d93-goog From nobody Fri Oct 2 07:46:35 2026 Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 583B23112A5 for ; Mon, 3 Aug 2026 21:51:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785793871; cv=none; b=ohckrTEd88ezSzOzjthX5a8Ho8PWYXHdCVHbJ8eIOonMPVpuRQkYfJnzsQ17dHWcEa4HBSBAGDoEepha77KOcuF+gL+GKwyQqzGaSJg1z+wVXMJkg69KgdxspFnOqEtsuF2nyhEZ1ah2xDpR/Kd8VTrUbaTZsxNAcqFruZdssWk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785793871; c=relaxed/simple; bh=FsUgLk766ZRbbjOIAaiSRCuqvU+yCxL6cW0M3pAZ+FI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=SyP8hZi5e+5S/RMXuKS/cXVOlvs0Odbf5JDHBIKDdDunZwOj5njmh5Pt796YirnvopLb6jA5hPMuHuye96GuoIFZQ38ekiRwmt+WaJOki4uNzCrMmhCm43mglkpsh6/qAQzsmc9p5JBkyCdlPCmlXkAez2+G8xDDxH7Ye7sZ4O8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--rathodpriyank.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Vks5tQTj; arc=none smtp.client-ip=209.85.214.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--rathodpriyank.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Vks5tQTj" Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2cc5faecf01so74664365ad.1 for ; Mon, 03 Aug 2026 14:51:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785793869; x=1786398669; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=LRBKJRqDdwyuffVZ6WAc5QHmw5xxQBAcOoh92VnWqbQ=; b=Vks5tQTjEbJWuSgwuE5wyYsgyI0VfVu8z97i8uJW/T3JqstxxsEpLH9aiM1Hy4V2hm gyAsYo/KkgJoGZMBm9b4qa/Bs5TaIrTjmTduVkpJXtN4hZ0IDLExINAH3g4yZdmC8wzz xb8WKvWSgkFwI3kX30b82zfaTQV4D329kbtj9DaOx1B6MajoZ/l0pqcNzVplm7IOmw7Y ber62tgQEdN+f3kbN6hIt6UXLDrU/QEpJ8ZPYtQfg0LCILJRSOP86xaDPRRU8VPvvqyo aIqQvsHEgb7spllCLShUUC+uvNVE9y2E9vWQ6pbmC9DDAB+rGeE6AB71B7vSVNcnMijv awTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785793869; x=1786398669; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=LRBKJRqDdwyuffVZ6WAc5QHmw5xxQBAcOoh92VnWqbQ=; b=RdD4c5m5BJXyT8mqlZ8iDPVLqn106OCvDbYQ5lBPuKVmYwCD+GWS38el4LEsRbDC+f QsGhQhqlijR5Ab7e+KOBYqs6b85TqSiOZjT5rdRH1L4Zq5m7Sez7cYJ0r0R/mPcS1O+R KsbAVe5Fg6a5QVz6TRlrQhPDpQZHKCSIdHMygobxS1EQtWkk7oeWRgpVF5nwfaIx3Hsn BSok1umzOqPgFi00KBnJ+9z+5oAa6FmDAWVidOfayBaaTalrcBi8VFSKp1+Kcaj3rrOo nijG3HS4x0v19fBRWo6+Z57gq6xA0XYVPxRrNquddRrhc16dIRpEWy9TI7Y99F2m//RW qVWw== X-Forwarded-Encrypted: i=1; AHgh+RpyQlZJD5cGUti2jx9kkriKAiVCgrP5QkfusI1iD+4zOk6628oLepPTwEplw+RfFX+d+YW67ELlSAmdPZU=@vger.kernel.org X-Gm-Message-State: AOJu0Yzfa0ynPGnygWJb4hwX2yDOmbTxhV4iS1wmLdUksApsV/scD8Pi n7jFUQqqrQgVpqe3o6VR8xhKOwIk40te4J+iJZ9+vONiEEoDg2/jmQ/4WmQbqXFDrAeuKHGAcHd nF4rPIFST1g06pJPqp+Pgm7RZ29ledbuh6A== X-Received: from plxd6.prod.google.com ([2002:a17:902:ef06:b0:2cc:7709:b166]) (user=rathodpriyank job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:390b:b0:2cf:bfbb:61e2 with SMTP id d9443c01a7336-2d0524723b8mr113426065ad.39.1785793868519; Mon, 03 Aug 2026 14:51:08 -0700 (PDT) Date: Mon, 03 Aug 2026 21:51:06 +0000 In-Reply-To: <20260803-b4-fix-aer-memleaks-v3-0-e87159611933@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260803-b4-fix-aer-memleaks-v3-0-e87159611933@google.com> X-Mailer: b4 0.14.3 Message-ID: <20260803-b4-fix-aer-memleaks-v3-2-e87159611933@google.com> Subject: [PATCH v3 2/2] PCI/AER: Fix memory leak in aer_recover_work_func() when pci_dev is missing From: Priyank Rathod To: Mahesh J Salgaonkar , "Oliver O'Halloran" , Bjorn Helgaas Cc: linuxppc-dev@lists.ozlabs.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Priyank Rathod Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable When ACPI APEI/GHES processes PCIe AER error records, it allocates memory for aer_capability_regs (entry.regs) from ghes_estatus_pool and queues the entry into aer_recover_ring. In aer_recover_work_func(), items are popped from aer_recover_ring via kfifo_get(). If pci_get_domain_bus_and_slot() fails to find a matching pci_dev, the code previously executed 'continue', bypassing the call to ghes_estatus_pool_region_free(). As a result, the memory allocated for entry.regs from ghes_estatus_pool was leaked. Refactor aer_recover_work_func() to ensure ghes_estatus_pool_region_free() is called unconditionally for every dequeued entry, releasing the pool memory even when pci_dev is missing. Signed-off-by: Priyank Rathod --- drivers/pci/pcie/aer.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index 967cde9dd519..9683cdef649b 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -1223,14 +1223,13 @@ static void aer_recover_work_func(struct work_struc= t *work) while (kfifo_get(&aer_recover_ring, &entry)) { pdev =3D pci_get_domain_bus_and_slot(entry.domain, entry.bus, entry.devfn); - if (!pdev) { + if (!pdev) pr_err_ratelimited("%04x:%02x:%02x.%x: no pci_dev found\n", entry.domain, entry.bus, PCI_SLOT(entry.devfn), PCI_FUNC(entry.devfn)); - continue; - } - pci_print_aer(pdev, entry.severity, entry.regs); + else + pci_print_aer(pdev, entry.severity, entry.regs); =20 /* * Memory for aer_capability_regs(entry.regs) is being @@ -1242,13 +1241,15 @@ static void aer_recover_work_func(struct work_struc= t *work) ghes_estatus_pool_region_free((unsigned long)entry.regs, sizeof(struct aer_capability_regs)); =20 - if (entry.severity =3D=3D AER_NONFATAL) - pcie_do_recovery(pdev, pci_channel_io_normal, - aer_root_reset); - else if (entry.severity =3D=3D AER_FATAL) - pcie_do_recovery(pdev, pci_channel_io_frozen, - aer_root_reset); - pci_dev_put(pdev); + if (pdev) { + if (entry.severity =3D=3D AER_NONFATAL) + pcie_do_recovery(pdev, pci_channel_io_normal, + aer_root_reset); + else if (entry.severity =3D=3D AER_FATAL) + pcie_do_recovery(pdev, pci_channel_io_frozen, + aer_root_reset); + pci_dev_put(pdev); + } } } =20 --=20 2.55.0.571.g244d577d93-goog