From: David S. Miller Date: Thu, 5 Aug 2021 10:36:59 +0000 (+0100) Subject: Merge branch 'bridge-ioctl-fixes' X-Git-Tag: v5.15~428^2~283 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d15040a33883c3ab2ee2ea17e6427ce24e9f3ac0;p=platform%2Fkernel%2Flinux-starfive.git Merge branch 'bridge-ioctl-fixes' Nikolay Aleksandrov says: ==================== net: bridge: fix recent ioctl changes These are three fixes for the recent bridge removal of ndo_do_ioctl done by commit ad2f99aedf8f ("net: bridge: move bridge ioctls out of .ndo_do_ioctl"). Patch 01 fixes a deadlock of the new bridge ioctl hook lock and rtnl by taking a netdev reference and always taking the bridge ioctl lock first then rtnl from within the bridge hook. Patch 02 fixes old_deviceless() bridge calls device name argument, and patch 03 checks in dev_ifsioc()'s SIOCBRADD/DELIF cases if the netdevice is actually a bridge before interpreting its private ptr as net_bridge. Patch 01 was tested by running old bridge-utils commands with lockdep enabled. Patch 02 was tested again by using bridge-utils and using the respective ioctl calls on a "up" bridge device. Patch 03 was tested by using the addif ioctl on a non-bridge device (e.g. loopback). ==================== Signed-off-by: David S. Miller --- d15040a33883c3ab2ee2ea17e6427ce24e9f3ac0