[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20170104093131.5982-1-chris@chris-wilson.co.uk>
Date: Wed, 4 Jan 2017 09:31:31 +0000
From: Chris Wilson <chris@...is-wilson.co.uk>
To: linux-kernel@...r.kernel.org
Cc: Chris Wilson <chris@...is-wilson.co.uk>,
Ming Lei <ming.lei@...onical.com>,
"Luis R. Rodriguez" <mcgrof@...nel.org>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Subject: [PATCH] firmware: Prevent oops on delayed abort
If the firmware load is slow and cancelled, we may call fw_load_abort()
twice and promptly oops on the second with a NULL dereference.
Signed-off-by: Chris Wilson <chris@...is-wilson.co.uk>
Cc: Ming Lei <ming.lei@...onical.com>
Cc: "Luis R. Rodriguez" <mcgrof@...nel.org>
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
---
drivers/base/firmware_class.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 4497d263209f..d03e21c1d2f3 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -557,6 +557,9 @@ static void fw_load_abort(struct firmware_priv *fw_priv)
{
struct firmware_buf *buf = fw_priv->buf;
+ if (!buf)
+ return;
+
__fw_load_abort(buf);
/* avoid user action after loading abort */
--
2.11.0
Powered by blists - more mailing lists