]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
PCI/AER: Fix NULL pointer access by aer_info
authorVernon Yang <yanglincheng@kylinos.cn>
Thu, 4 Sep 2025 18:25:27 +0000 (02:25 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Nov 2025 20:37:20 +0000 (15:37 -0500)
[ Upstream commit 0a27bdb14b028fed30a10cec2f945c38cb5ca4fa ]

The kzalloc(GFP_KERNEL) may return NULL, so all accesses to aer_info->xxx
will result in kernel panic. Fix it.

Signed-off-by: Vernon Yang <yanglincheng@kylinos.cn>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://patch.msgid.link/20250904182527.67371-1-vernon2gm@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/pci/pcie/aer.c

index 9d23294ceb2f6c4a61afc44fe0dfd382ef302a88..3dba9c0c6ae1128640cb34aa0b1edc125f0b8061 100644 (file)
@@ -383,6 +383,10 @@ void pci_aer_init(struct pci_dev *dev)
                return;
 
        dev->aer_info = kzalloc(sizeof(*dev->aer_info), GFP_KERNEL);
+       if (!dev->aer_info) {
+               dev->aer_cap = 0;
+               return;
+       }
 
        ratelimit_state_init(&dev->aer_info->correctable_ratelimit,
                             DEFAULT_RATELIMIT_INTERVAL, DEFAULT_RATELIMIT_BURST);