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 E135052BE53 for ; Tue, 29 Sep 2026 13:31:20 +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=1790688682; cv=none; b=gYQKEkTgGwZfgP265RYHjzgB6T8mFKiwOp6fwJILQpvN85OKZ7kCnFWuax4QUDW0LcQA+UBZQ7897L7+NtJ2ZX5Owq/d9ZeSnZOwlPD9+PrqWx+Tojiy6gBRlSlqEKhqyLQYBjNUB6ts9wili1Us/JsjU682njuzX1zJAhRkayQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790688682; c=relaxed/simple; bh=e33C9tWq5KkvqphITqNwzsHpy1YK596FvcQ/IuUe/xg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FAxpNXup2NRgRVwItFUCF150sgkB4yHtQumr+dn7i8RkOKL8bq4yEqK4hnPeLAZl+pvjlM8smqIzd7MlPHfwFIq/Ig5fjimxWcZVcVjAW38ke9KMRsWOy3RyRGwsh1f59kDit4GnO7a+Q5CVaQkkCr4Ro7A1vRo0sry6O44qoNc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dCZ5xyiE; 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="dCZ5xyiE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 026981F000FF; Tue, 29 Sep 2026 13:31:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1790688680; bh=aWHOsehV2CXEoQPABhF8vlkMCabK+9iOejjH7Xte1jc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dCZ5xyiEiQFK6HQBqwoA8RqtI47VhTIQoSOlXCRuSY04kF5p5gA+mj4XGKl/sL/TW J56q25yMh+YGwQ19f64/xgdda4Jzu62svcbt3mJOw4OucQf7Kd32jgGaRXy36PRYA/ v/VybDF0Urf8CGVPSOgYbR/uvHDjt7tytmCmuxYAezntiQAINywguHfif/xLf/mspT PsMrznARO2Yq161GQ4xoQkDX5m7g5tzxC7KmUJ+kk9Hm7WkhmLvmUZVXdoagxCBXbU okXkI7VTk45zI4S6sdCtpiL/gFYLua8+jZ6SDqjgGHcGjRWjocyMghKvzo3fJS7wqU jhPwbTQMMZqQQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Myeonghun Pak , Ijae Kim , Paolo Abeni , Sasha Levin Subject: [PATCH 6.6.y] bna: prevent IOC timer rearm during teardown Date: Tue, 29 Sep 2026 09:31:18 -0400 Message-ID: <20260929133118.3503962-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026092951-corporal-ascension-4e63@gregkh> References: <2026092951-corporal-ascension-4e63@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 6cf06a93bedfb..c01c849a8d1aa 100644 --- a/drivers/net/ethernet/brocade/bna/bnad.c +++ b/drivers/net/ethernet/brocade/bna/bnad.c @@ -3727,9 +3727,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); @@ -3770,9 +3772,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