From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967228AbdADJcq (ORCPT ); Wed, 4 Jan 2017 04:32:46 -0500 Received: from mail-wj0-f193.google.com ([209.85.210.193]:33861 "EHLO mail-wj0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967061AbdADJcl (ORCPT ); Wed, 4 Jan 2017 04:32:41 -0500 From: Chris Wilson To: linux-kernel@vger.kernel.org Cc: Chris Wilson , Ming Lei , "Luis R. Rodriguez" , Greg Kroah-Hartman Subject: [PATCH] firmware: Prevent oops on delayed abort Date: Wed, 4 Jan 2017 09:31:31 +0000 Message-Id: <20170104093131.5982-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: Ming Lei Cc: "Luis R. Rodriguez" Cc: Greg Kroah-Hartman --- 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