diff options
| author |   Nikolay Aleksandrov <nikolay@nvidia.com> | 2021-08-05 11:29:02 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-08-05 11:36:59 +0100 |
| commit | cbd7ad29a5070a75dd076118ce7e400ce4b8d8d1 (patch) | |
| tree | 4fe3e38ec93de465ef6522321db277cf4cfb6cca /net/bridge/br_ioctl.c | |
| parent | net: bridge: fix ioctl locking (diff) | |
| download | linux-dev-cbd7ad29a5070a75dd076118ce7e400ce4b8d8d1.tar.xz linux-dev-cbd7ad29a5070a75dd076118ce7e400ce4b8d8d1.zip | |
net: bridge: fix ioctl old_deviceless bridge argument
Commit ad2f99aedf8f ("net: bridge: move bridge ioctls out of .ndo_do_ioctl")
changed the source of the argument copy in bridge's old_deviceless() from
args[1] (user ptr to device name) to uarg (ptr to ioctl arguments) causing
wrong device name to be used.
Example (broken, bridge exists but is up):
$ brctl delbr bridge
bridge bridge doesn't exist; can't delete it
Example (working):
$ brctl delbr bridge
bridge bridge is still up; can't delete it
Fixes: ad2f99aedf8f ("net: bridge: move bridge ioctls out of .ndo_do_ioctl")
Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_ioctl.c')
| -rw-r--r-- | net/bridge/br_ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c index 2f848de3e755..793b0db9d9a3 100644 --- a/net/bridge/br_ioctl.c +++ b/net/bridge/br_ioctl.c @@ -351,7 +351,7 @@ static int old_deviceless(struct net *net, void __user *uarg) if (!ns_capable(net->user_ns, CAP_NET_ADMIN)) return -EPERM; - if (copy_from_user(buf, uarg, IFNAMSIZ)) + if (copy_from_user(buf, (void __user *)args[1], IFNAMSIZ)) return -EFAULT; buf[IFNAMSIZ-1] = 0; |