From: Russell Currey <ruscur@russell.cc>
To: linuxppc-dev@lists.ozlabs.org
Cc: aik@ozlabs.ru, Russell Currey <ruscur@russell.cc>
Subject: [PATCH] powerpc/eeh: Avoid use after free in eeh_handle_special_event()
Date: Fri, 3 Mar 2017 15:47:18 +1100 [thread overview]
Message-ID: <20170303044718.19253-1-ruscur@russell.cc> (raw)
eeh_handle_special_event() is called when an EEH event is detected but
can't be narrowed down to a specific PE. This function looks through
every PE to find one in an erroneous state, then calls the regular event
handler eeh_handle_normal_event() once it knows which PE has an error.
However, if eeh_handle_normal_event() found that the PE cannot possibly
be recovered, it will remove the PE and associated devices. This leads
to a use after free in eeh_handle_special_event() as it attempts to clear
the "recovering" state on the PE after eeh_handle_normal_event() returns.
Thus, make sure the PE is valid when attempting to clear state in
eeh_handle_special_event().
Cc: <stable@vger.kernel.org> #3.10+
Reported-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Russell Currey <ruscur@russell.cc>
---
arch/powerpc/kernel/eeh_driver.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c
index b94887165a10..492397298a2a 100644
--- a/arch/powerpc/kernel/eeh_driver.c
+++ b/arch/powerpc/kernel/eeh_driver.c
@@ -983,6 +983,19 @@ static void eeh_handle_special_event(void)
if (rc == EEH_NEXT_ERR_FROZEN_PE ||
rc == EEH_NEXT_ERR_FENCED_PHB) {
eeh_handle_normal_event(pe);
+
+ /*
+ * eeh_handle_normal_event() can free the PE if it
+ * determines that the PE cannot possibly be recovered.
+ * Make sure the PE still exists before changing its
+ * state.
+ */
+ if (!pe || (pe->type & EEH_PE_INVALID)
+ || (pe->state & EEH_PE_REMOVED)) {
+ pr_warn("EEH: not clearing state on bad PE\n");
+ continue;
+ }
+
eeh_pe_state_clear(pe, EEH_PE_RECOVERING);
} else {
pci_lock_rescan_remove();
--
2.12.0
next reply other threads:[~2017-03-03 4:47 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-03 4:47 Russell Currey [this message]
2017-03-03 5:55 ` [PATCH] powerpc/eeh: Avoid use after free in eeh_handle_special_event() Gavin Shan
2017-03-03 6:05 ` Alexey Kardashevskiy
2017-03-03 5:59 ` Alexey Kardashevskiy
2017-03-05 23:22 ` Gavin Shan
2017-03-06 1:54 ` Alexey Kardashevskiy
2017-04-07 3:28 ` Alexey Kardashevskiy
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=20170303044718.19253-1-ruscur@russell.cc \
--to=ruscur@russell.cc \
--cc=aik@ozlabs.ru \
--cc=linuxppc-dev@lists.ozlabs.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).