diff options
| author |   David S. Miller <davem@davemloft.net> | 2021-08-05 11:36:59 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-08-05 11:36:59 +0100 |
| commit | d15040a33883c3ab2ee2ea17e6427ce24e9f3ac0 (patch) | |
| tree | cdc7a2fa03144725689da62cf4f7233690965c42 /drivers/net/netdevsim/dev.c | |
| parent | net/ipv4: Revert use of struct_size() helper (diff) | |
| parent | net: core: don't call SIOCBRADD/DELIF for non-bridge devices (diff) | |
| download | wireguard-linux-d15040a33883c3ab2ee2ea17e6427ce24e9f3ac0.tar.xz wireguard-linux-d15040a33883c3ab2ee2ea17e6427ce24e9f3ac0.zip | |
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 <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netdevsim/dev.c')
0 files changed, 0 insertions, 0 deletions