Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758747AbcLTPZq (ORCPT ); Tue, 20 Dec 2016 10:25:46 -0500 Received: from mail-oi0-f66.google.com ([209.85.218.66]:36662 "EHLO mail-oi0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757659AbcLTPZn (ORCPT ); Tue, 20 Dec 2016 10:25:43 -0500 Subject: Re: [PATCH] rtlwifi: Fix kernel oops introduced with commit e49656147359 To: Kalle Valo References: <20161220023812.5999-1-Larry.Finger@lwfinger.net> <87wpeuu9qm.fsf@kamboji.qca.qualcomm.com> Cc: Linus Torvalds , devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, driver-devel@vger.kernel.org, Stable , Wei Yongjun From: Larry Finger Message-ID: Date: Tue, 20 Dec 2016 09:25:40 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: <87wpeuu9qm.fsf@kamboji.qca.qualcomm.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1174 Lines: 38 On 12/20/2016 05:21 AM, Kalle Valo wrote: > Larry Finger writes: > >> With commit e49656147359 {"rtlwifi: Use dev_kfree_skb_irq instead of >> kfree_skb"), the method used to free an skb was changed because the >> kfree_skb() was inside a spinlock. What was forgotten is that kfree_skb() >> guards against a NULL value for the argument. Routine dev_kfree_skb_irq() >> does not, and a test is needed to prevent kernel panics. >> >> Fixes: commit e49656147359 {"rtlwifi: Use dev_kfree_skb_irq instead of kfree_skb") > > This should be: > > Fixes: e49656147359 ("rtlwifi: Use dev_kfree_skb_irq instead of kfree_skb") > >> Signed-off-by: Larry Finger >> Cc: Stable (4.9+) > > And this: > > Cc: Stable # 4.9+ > > I can fix both of them. > >> Cc: Wei Yongjun >> --- >> Kalle, >> >> This change should be sent to mainline during the 4.10 merge period, >> or as soon as possible. > > Ok, I'll queue this to 4.10. Most likely I'll send a pull request to > Dave later this week or so. Thanks for the suggested changes, and for the quick action. Larry