diff options
| author | Kleber Sacilotto de Souza <klebers@linux.vnet.ibm.com> | 2012-07-12 17:14:36 +0000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-07-13 13:37:17 +1000 |
| commit | 10db8d212864cb6741df7d7fafda5ab6661f6f88 (patch) | |
| tree | ad321c9ec8d250bf0c1d7a2cc61fec190b0e3be6 /arch/powerpc/platforms/pseries/eeh_event.c | |
| parent | 26b0d14106954ae46d2f4f7eec3481828a210f7d (diff) | |
powerpc/eeh: Check handle_eeh_events() return value
Function eeh_event_handler() dereferences the pointer returned by
handle_eeh_events() without checking, causing a crash if NULL was
returned, which is expected in some situations.
This patch fixes this bug by checking for the value returned by
handle_eeh_events() before dereferencing it.
Signed-off-by: Kleber Sacilotto de Souza <klebers@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: stable@vger.kernel.org [v3.4+]
Diffstat (limited to 'arch/powerpc/platforms/pseries/eeh_event.c')
| -rw-r--r-- | arch/powerpc/platforms/pseries/eeh_event.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/pseries/eeh_event.c b/arch/powerpc/platforms/pseries/eeh_event.c index 4cb375c0f8d..fb506317ebb 100644 --- a/arch/powerpc/platforms/pseries/eeh_event.c +++ b/arch/powerpc/platforms/pseries/eeh_event.c @@ -85,8 +85,10 @@ static int eeh_event_handler(void * dummy) set_current_state(TASK_INTERRUPTIBLE); /* Don't add to load average */ edev = handle_eeh_events(event); - eeh_clear_slot(eeh_dev_to_of_node(edev), EEH_MODE_RECOVERING); - pci_dev_put(edev->pdev); + if (edev) { + eeh_clear_slot(eeh_dev_to_of_node(edev), EEH_MODE_RECOVERING); + pci_dev_put(edev->pdev); + } kfree(event); mutex_unlock(&eeh_event_mutex); |