From: Thomas Tai <thomas.tai@oracle.com>
To: thomas.tai@oracle.com, bhelgaas@google.com, poza@codeaurora.org
Cc: linux-pci@vger.kernel.org
Subject: [PATCH V2, 1/1] PCI/AER: fix use-after-free in pcie_do_fatal_recovery
Date: Thu, 12 Jul 2018 11:33:43 -0600 [thread overview]
Message-ID: <1531416823-17841-2-git-send-email-thomas.tai@oracle.com> (raw)
In-Reply-To: <1531416823-17841-1-git-send-email-thomas.tai@oracle.com>
When an fatal error is recevied by a non-bridge device,
the device is removed from the pci bus and the device structure
is freed by pci_stop_and_remove_bus_device(). The freed device
structure is used in the subsequence pci_info() to printout the
message. It causes a corrupt printout. If slub_debug=FZP is used,
it will cause following protection fault after a fatal error is
received.
general protection fault: 0000 [#1] SMP PTI
CPU: 104 PID: 1077 Comm: kworker/104:1 Not tainted 4.18.0-rc1ttai #5
Hardware name: Oracle Corporation ORACLE SERVER X5-4/ASSY,MB WITH TRAY,
BIOS 36030500 11/16/2016
Workqueue: events aer_isr
RIP: 0010:__dev_printk+0x2e/0x90
Code: 00 55 49 89 d1 48 89 e5 53 48 89 fb 48 83 ec 18 48 85 f6
74 5f 4c 8b 46 50 4d 85 c0 74 2b 48 8b 86 88 00 00 00 48 85 c0
74 25 <48> 8b 08 0f be 7b 01 48 c7 c2 83 d4 71 99 31 c0 83 ef
30 e8 4a ff
RSP: 0018:ffffb6b88fa57cf8 EFLAGS: 00010202
RAX: 6b6b6b6b6b6b6b6b RBX: ffffffff996ba720 RCX: 0000000000000000
RDX: ffffb6b88fa57d28 RSI: ffff8c4d7af94128 RDI: ffffffff996ba720
RBP: ffffb6b88fa57d18 R08: 6b6b6b6b6b6b6b6b R09: ffffb6b88fa57d28
R10: ffffffff99baca80 R11: 0000000000000000 R12: ffff8c4d7ae95990
R13: ffff8c2d7a840008 R14: ffff8c4d7af94088 R15: ffff8c4d7af90008
FS: 0000000000000000(0000) GS:ffff8c2d7fc00000(0000)
knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007f22c0839000 CR3: 000000136bc0a001 CR4: 00000000001606e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Call Trace:
? pci_bus_add_device+0x4f/0xa0
_dev_info+0x6c/0x90
pcie_do_fatal_recovery+0x1d5/0x230
aer_isr+0x3e5/0x950
? add_timer_on+0xcc/0x160
process_one_work+0x168/0x370
worker_thread+0x4f/0x3d0
kthread+0x105/0x140
? max_active_store+0x80/0x80
? kthread_bind+0x20/0x20
ret_from_fork+0x35/0x40
To fix this issue, pci_dev_get and pci_dev_put is placed at the
entry and exit of the function. This way the device structure is
free only at the end of the function if needed.
Signed-off-by: Thomas Tai <thomas.tai@oracle.com>
---
drivers/pci/pcie/err.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/pci/pcie/err.c b/drivers/pci/pcie/err.c
index f7ce0cb..e5decd8 100644
--- a/drivers/pci/pcie/err.c
+++ b/drivers/pci/pcie/err.c
@@ -288,6 +288,7 @@ void pcie_do_fatal_recovery(struct pci_dev *dev, u32 service)
struct pci_dev *pdev, *temp;
pci_ers_result_t result;
+ pci_dev_get(dev);
if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE)
udev = dev;
else
@@ -329,6 +330,7 @@ void pcie_do_fatal_recovery(struct pci_dev *dev, u32 service)
}
pci_unlock_rescan_remove();
+ pci_dev_put(dev);
}
/**
--
1.8.3.1
next prev parent reply other threads:[~2018-07-12 17:44 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-12 17:33 [PATCH V2, 0/1] PCI/AER: fix use-after-free in pcie_do_fatal_recovery Thomas Tai
2018-07-12 17:33 ` Thomas Tai [this message]
2018-07-12 21:51 ` Bjorn Helgaas
2018-07-12 21:57 ` Keith Busch
2018-07-16 14:06 ` Thomas Tai
2018-07-18 21:16 ` Bjorn Helgaas
2018-07-18 21:43 ` Thomas Tai
2018-07-18 21:57 ` Bjorn Helgaas
2018-07-15 18:55 ` poza
2018-07-16 14:00 ` Keith Busch
2018-07-16 14:17 ` Thomas Tai
2018-07-18 21:32 ` Thomas Tai
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=1531416823-17841-2-git-send-email-thomas.tai@oracle.com \
--to=thomas.tai@oracle.com \
--cc=bhelgaas@google.com \
--cc=linux-pci@vger.kernel.org \
--cc=poza@codeaurora.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.