| Message ID | 58b57fd67e045f7700b5a91b4f0f80089bca391e.1536715396.git.sbobroff@linux.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f9bc28aedfb5bbd572d2d365f3095c1becd7209b |
| Headers | show |
| Series | EEH refactoring 3 | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | next/apply_patch Successfully applied |
| snowpatch_ozlabs/checkpatch | success | Test checkpatch on branch next |
On Wed, 2018-09-12 at 01:23:20 UTC, Sam Bobroff wrote: > If an error occurs during an unplug operation, it's possible for > eeh_dump_dev_log() to be called when edev->pdn is null, which > currently leads to dereferencing a null pointer. > > Handle this by skipping the error log for those devices. > > Signed-off-by: Sam Bobroff <sbobroff@linux.ibm.com> Series applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/f9bc28aedfb5bbd572d2d365f3095c cheers
diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c index ac1cecc05742..69754af506dd 100644 --- a/arch/powerpc/kernel/eeh.c +++ b/arch/powerpc/kernel/eeh.c @@ -169,6 +169,11 @@ static size_t eeh_dump_dev_log(struct eeh_dev *edev, char *buf, size_t len) int n = 0, l = 0; char buffer[128]; + if (!pdn) { + pr_warn("EEH: Note: No error log for absent device.\n"); + return 0; + } + n += scnprintf(buf+n, len-n, "%04x:%02x:%02x.%01x\n", pdn->phb->global_number, pdn->busno, PCI_SLOT(pdn->devfn), PCI_FUNC(pdn->devfn));
If an error occurs during an unplug operation, it's possible for eeh_dump_dev_log() to be called when edev->pdn is null, which currently leads to dereferencing a null pointer. Handle this by skipping the error log for those devices. Signed-off-by: Sam Bobroff <sbobroff@linux.ibm.com> --- arch/powerpc/kernel/eeh.c | 5 +++++ 1 file changed, 5 insertions(+)