From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761139AbdADRFP (ORCPT ); Wed, 4 Jan 2017 12:05:15 -0500 Received: from mx2.suse.de ([195.135.220.15]:52557 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756053AbdADREC (ORCPT ); Wed, 4 Jan 2017 12:04:02 -0500 Date: Wed, 4 Jan 2017 17:50:46 +0100 From: "Luis R. Rodriguez" To: Chris Wilson Cc: "Luis R. Rodriguez" , Ming Lei , Linux Kernel Mailing List , Greg Kroah-Hartman Subject: Re: [PATCH] firmware: Prevent oops on delayed abort Message-ID: <20170104165046.GH13946@wotan.suse.de> References: <20170104093131.5982-1-chris@chris-wilson.co.uk> <20170104154049.GG13946@wotan.suse.de> <20170104154749.GI9639@nuc-i3427.alporthouse.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170104154749.GI9639@nuc-i3427.alporthouse.com> User-Agent: Mutt/1.6.0 (2016-04-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jan 04, 2017 at 03:47:49PM +0000, Chris Wilson wrote: > On Wed, Jan 04, 2017 at 04:40:49PM +0100, Luis R. Rodriguez wrote: > > On Wed, Jan 04, 2017 at 07:12:11PM +0800, Ming Lei wrote: > > > On Wed, Jan 4, 2017 at 5:31 PM, Chris Wilson wrote: > > > > 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 > > > > > > > > > > Looks fine, > > > > > > Acked-by: Ming Lei > > > > But does this fix an actual oops or just theoretical? If it does can you > > include the trace, and amend the commit log to Cc stable so this gets > > properly propagated into the stable kernels? > > Actual oops, I was going to include the oops from dmesg but that was > lost on a the forced reboot. It's fairly clear the cause once you read > the callers. I see, if you can reproduce and include it that would be greatly appreciated, and please re-submit and Cc stable on the commit log, if you can indicate as of what kernel this is needed even better (Fixes: tag might help). Luis