Skip to content

Commit

Permalink
mctp: Remove device type check at unregister
Browse files Browse the repository at this point in the history
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.

Fixes: 7b1871a ("mctp: Warn if pointer is set for a wrong dev type")
Signed-off-by: Matt Johnston <matt@codeconstruct.com.au>
Link: https://lore.kernel.org/r/20221215054933.2403401-1-matt@codeconstruct.com.au
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Matt Johnston authored and Jakub Kicinski committed Dec 20, 2022
1 parent 62e027f commit b389a90
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions net/mctp/device.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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))
Expand Down

0 comments on commit b389a90

Please sign in to comment.