mctp: Remove device type check at unregister
Matt Johnston
maintainerPATCH v2 1/1 mctp: Remove device type check at unregister
The unregister check could be incorrectly triggered if a netdev changes its type after register. That is possible for a tun device using TUNSETLINK ioctl, resulting in mctp unregister failing and the netdev unregister waiting forever.
This was encountered by https://github.com/openthread/openthread/issues/8523
Neither check at register or unregister is required. They were added in an attempt to track down mctp_ptr being set unexpectedly, which should not happen in normal operation.
---
v2: Also remove the check from register
net/mctp/device.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-)
net/mctp/device.c +1 -13
@@ -429,12 +429,6 @@ static void mctp_unregister(struct net_device *dev)struct mctp_dev *mdev; mdev =mctp_dev_get_rtnl (dev); -if (mdev && !mctp_known (dev)) { -// Sanity check, should match what was set in mctp_register -netdev_warn (dev,"%s: BUG mctp_ptr set for unknown type %d" , - __func__, dev->type); -return ; - }if (!mdev)return ;
@@ -451,14 +445,8 @@ static int mctp_register(struct net_device *dev)struct mctp_dev *mdev;/* Already registered? */ - mdev =rtnl_dereference (dev->mctp_ptr); - -if (mdev) { -if (!mctp_known (dev)) -netdev_warn (dev,"%s: BUG mctp_ptr set for unknown type %d" , - __func__, dev->type); +if (rtnl_dereference (dev->mctp_ptr))return 0 ; - }/* only register specific types */ if (!mctp_known (dev))
Signature · 1 line
2.37.2
This patch was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Thu, 15 Dec 2022 13:49:33 +0800 you wrote:
The unregister check could be incorrectly triggered if a netdev changes its type after register. That is possible for a tun device using TUNSETLINK ioctl, resulting in mctp unregister failing and the netdev unregister waiting forever.
This was encountered by https://github.com/openthread/openthread/issues/8523
[...]
Here is the summary with links:
- [net,v2] mctp: Remove device type check at unregister
https://git.kernel.org/netdev/net/c/b389a902dd5b
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html