netconsole: clear cached dev_name on resume-window cleanup
Subsystems (3)
Breno Leitao
maintainerPATCH 1/1 netconsole: clear cached dev_name on resume-window cleanup
When process_resume_target() catches a device that was unregistered while the target was off target_list, it calls do_netpoll_cleanup() to release the reference but leaves the cached np.dev_name in place. The other cleanup path, netconsole_process_cleanups_core(), already wipes dev_name for MAC-bound targets because the name was only a cache of the device that last carried the MAC and may no longer match.
The pattern is the same in both spots, so fold it into a small helper netcons_release_dev() and route both call sites through it. This makes the resume-window cleanup consistent with the notifier-driven one so a later enable does not let netpoll_setup() pick a stale interface by name when the user bound the target by MAC.
--- drivers/net/netconsole.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/net/netconsole.c +9 -4
@@ -283,6 +283,13 @@ static bool bound_by_mac(struct netconsole_target *nt)return is_valid_ether_addr (nt->np.dev_mac); } +static void netcons_release_dev (struct netconsole_target *nt) +{ +do_netpoll_cleanup (&nt->np); +if (bound_by_mac (nt)) +memset (&nt->np.dev_name,0 ,IFNAMSIZ ); +} +/* Attempts to resume logging to a deactivated target. */ static void resume_target (struct netconsole_target *nt) {
@@ -349,7 +356,7 @@ static void process_resume_target(struct work_struct *work)rtnl_lock ();if (nt->state ==STATE_ENABLED && nt->np.dev && nt->np.dev->reg_state !=NETREG_REGISTERED ) { -do_netpoll_cleanup (&nt->np); +netcons_release_dev (nt); nt->state =STATE_DISABLED ; }
@@ -408,9 +415,7 @@ static void netconsole_process_cleanups_core(void)list_for_each_entry_safe (nt, tmp, &target_cleanup_list, list) {/* all entries in the cleanup_list needs to be disabled */ WARN_ON_ONCE (nt->state ==STATE_ENABLED ); -do_netpoll_cleanup (&nt->np); -if (bound_by_mac (nt)) -memset (&nt->np.dev_name,0 ,IFNAMSIZ ); +netcons_release_dev (nt);/* moved the cleaned target to target_list. Need to hold both * locks */
---
base-commit: 5855479abc796c3b5d7b2f2ca147d68fc56cae1f
change-id: 20260610-netconsole_fix_more-181a3e6f66ce
Best regards,
Signature · 1 line
Breno Leitao <[email protected]>
Quoted 6 lines · Breno Leitao
This makes the resume-window cleanup consistent with the notifier-driven one so a later enable does not let
netpoll_setup()pick a stale interface by name when the user bound the target by MAC.Signed-off-by Breno Leitao <[email protected]>---
Signature · 1 line
Andre Carvalho
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Wed, 10 Jun 2026 07:26:04 -0700 you wrote:
When
process_resume_target()catches a device that was unregistered while the target was offtarget_list, it callsdo_netpoll_cleanup()to release the reference but leaves the cached np.dev_name in place. The other cleanup path,netconsole_process_cleanups_core(), already wipesdev_namefor MAC-bound targets because the name was only a cache of the device that last carried the MAC and may no longer match.[...]
Here is the summary with links:
- [net-next] netconsole: clear cached dev_name on resume-window cleanup
https://git.kernel.org/netdev/net-next/c/02a61d2018c4
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html