From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:41344 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751908AbdFOJOB (ORCPT ); Thu, 15 Jun 2017 05:14:01 -0400 Subject: Patch "ibmvnic: Call napi_disable instead of napi_enable in failure path" has been added to the 4.9-stable tree To: nfont@linux.vnet.ibm.com, alexander.levin@verizon.com, davem@davemloft.net, gregkh@linuxfoundation.org Cc: , From: Date: Thu, 15 Jun 2017 11:13:48 +0200 Message-ID: <149751802825270@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled ibmvnic: Call napi_disable instead of napi_enable in failure path to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: ibmvnic-call-napi_disable-instead-of-napi_enable-in-failure-path.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From foo@baz Thu Jun 15 11:12:23 CEST 2017 From: Nathan Fontenot Date: Tue, 23 May 2017 21:53:38 -0400 Subject: ibmvnic: Call napi_disable instead of napi_enable in failure path From: Nathan Fontenot [ Upstream commit e722af6391949e8851310441bb0cec157d25611d ] The failure path in ibmvnic_open() mistakenly makes a second call to napi_enable instead of calling napi_disable. This can result in a BUG_ON for any queues that were enabled in the previous call to napi_enable. Signed-off-by: Nathan Fontenot Signed-off-by: David S. Miller Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/ibm/ibmvnic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -505,7 +505,7 @@ rx_pool_alloc_failed: adapter->rx_pool = NULL; rx_pool_arr_alloc_failed: for (i = 0; i < adapter->req_rx_queues; i++) - napi_enable(&adapter->napi[i]); + napi_disable(&adapter->napi[i]); alloc_napi_failed: return -ENOMEM; } Patches currently in stable-queue which might be from nfont@linux.vnet.ibm.com are queue-4.9/ibmvnic-call-napi_disable-instead-of-napi_enable-in-failure-path.patch queue-4.9/ibmvnic-initialize-completion-variables-before-starting-work.patch