From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CF06F343D85 for ; Tue, 29 Sep 2026 12:46:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790685990; cv=none; b=eLhHXKip6VciaVxGq31wuM4R7vqBpa+2lXW9r9L6j+ncK5CiYNaT30nMSh25YODU5j6OjR+7aeCPW903eIX3uNiqLOYMf5fWrRZ2Q5JpeUunWOh2+YuM6pUu3ywML/UkN31zTwHr/Moo1jEOUdbrgfPmZySDkahIMwnYnf07Etw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790685990; c=relaxed/simple; bh=ryMNRefHHT5eq7c5E7nh0I8RiclWVGVU0ru3appmZys=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=clVNYwj7mjuji4lcHrK4Z/YphtmaFjcApsI46IGZfIRTEHLsmL7VZje/Y+Pp2efwTjk3BwT6MSqSVrJuqvCm2qilFJ/J/Kcq6qSAfQ6SwM7agelLi7Eg5ZHhCpt58p7L3jwk+47tV9wB0dT0h+TSVEPSWFkHZYNbQYvm1fGY7w0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WUaT4irs; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WUaT4irs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AEE221F000FF; Tue, 29 Sep 2026 12:46:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1790685989; bh=a90+8nxYwyVGHMMzIR2QvX49nPP0IVOPaegN0QjMmsc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WUaT4irsnLXl6SDVYa3ruusWDeYk/lPtPKuSBqzu/mXc9iKVYURCg4/5XQjXkruWD rH00X3Sxr4n96dEYrgTOT/TxrdsM/6N7Nam7XddA7XZoM3K27pyHMc5ienQxXJWdB4 8MKx3BSKNf+R0f4R3c/MdacN7qeCKXSt+zW5EjrGktnGUFa4xxES7ajqudtnJWLoVu UxruHhLlP5n7fncy2PD6f9ZIy/ADirp1gZ/e8kXYQkdvB9diw418WcrCGoOfejFvJ3 IGMRjNzA4Z6d5+5lPu5ebVfgdm1wX+QnmyP8P9loojuaO9zFDfLYH/VA3IrgVYSNHJ 1JC6LT1CW7LQA== From: Sasha Levin To: stable@vger.kernel.org Cc: Myeonghun Pak , Ijae Kim , Paolo Abeni , Sasha Levin Subject: [PATCH 6.12.y] bna: prevent IOC timer rearm during teardown Date: Tue, 29 Sep 2026 08:46:27 -0400 Message-ID: <20260929124627.3453748-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026092950-country-linoleum-b03a@gregkh> References: <2026092950-country-linoleum-b03a@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Myeonghun Pak [ Upstream commit 77b1718e39e5c9f6956fb60807326af20baf889d ] bna: prevent IOC timer rearm during teardown bnad_pci_remove() and the probe disable_ioceth path call timer_delete_sync() for ioc_timer, sem_timer and hb_timer, but not for iocpf_timer. bnad_iocpf_timeout() then takes bnad->bna_lock after free_netdev() has freed the struct bnad. Deleting iocpf_timer last does not fix this. sem_timer and iocpf_timer rearm each other: bnad_iocpf_sem_timeout() can arm iocpf_timer, and bnad_iocpf_timeout() arms sem_timer from bfa_ioc_hw_sem_get() when the semaphore is busy. timer_delete_sync() only waits out its own callback. bnad_ioceth_disable() can time out and leave that callback live. Shut all four IOC timers down with timer_shutdown_sync() on both paths, so a later mod_timer() is ignored. This issue was identified during our ongoing static-analysis research while reviewing kernel code. Fixes: 1d32f7696286 ("bna: IOC failure auto recovery fix") Cc: stable@vger.kernel.org Assisted-by: LLM Co-developed-by: Ijae Kim Signed-off-by: Ijae Kim Signed-off-by: Myeonghun Pak Link: https://patch.msgid.link/20260922014605.588040-1-mhun512@gmail.com Signed-off-by: Paolo Abeni [ inlined bnad_ioc_timers_shutdown() into the existing teardown functions. ] Signed-off-by: Sasha Levin --- drivers/net/ethernet/brocade/bna/bnad.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c index ece6f3b483273..757ae52224f5d 100644 --- a/drivers/net/ethernet/brocade/bna/bnad.c +++ b/drivers/net/ethernet/brocade/bna/bnad.c @@ -3725,9 +3725,11 @@ bnad_pci_probe(struct pci_dev *pdev, bnad_res_free(bnad, &bnad->mod_res_info[0], BNA_MOD_RES_T_MAX); disable_ioceth: bnad_ioceth_disable(bnad); - del_timer_sync(&bnad->bna.ioceth.ioc.ioc_timer); - del_timer_sync(&bnad->bna.ioceth.ioc.sem_timer); - del_timer_sync(&bnad->bna.ioceth.ioc.hb_timer); + /* The IOC timers rearm one another. Shut down all of them. */ + timer_shutdown_sync(&bnad->bna.ioceth.ioc.ioc_timer); + timer_shutdown_sync(&bnad->bna.ioceth.ioc.sem_timer); + timer_shutdown_sync(&bnad->bna.ioceth.ioc.hb_timer); + timer_shutdown_sync(&bnad->bna.ioceth.ioc.iocpf_timer); spin_lock_irqsave(&bnad->bna_lock, flags); bna_uninit(bna); spin_unlock_irqrestore(&bnad->bna_lock, flags); @@ -3768,9 +3770,11 @@ bnad_pci_remove(struct pci_dev *pdev) mutex_lock(&bnad->conf_mutex); bnad_ioceth_disable(bnad); - del_timer_sync(&bnad->bna.ioceth.ioc.ioc_timer); - del_timer_sync(&bnad->bna.ioceth.ioc.sem_timer); - del_timer_sync(&bnad->bna.ioceth.ioc.hb_timer); + /* The IOC timers rearm one another. Shut down all of them. */ + timer_shutdown_sync(&bnad->bna.ioceth.ioc.ioc_timer); + timer_shutdown_sync(&bnad->bna.ioceth.ioc.sem_timer); + timer_shutdown_sync(&bnad->bna.ioceth.ioc.hb_timer); + timer_shutdown_sync(&bnad->bna.ioceth.ioc.iocpf_timer); spin_lock_irqsave(&bnad->bna_lock, flags); bna_uninit(bna); spin_unlock_irqrestore(&bnad->bna_lock, flags); -- 2.53.0