diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-12-24 01:09:58 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-12-24 01:09:58 +0100 |
| commit | 8b3f91332291fa280a56215f5189baca185998f5 (patch) | |
| tree | b89f58972c80ffacf57c4c9cedb5b4b03473c5be /net/bridge | |
| parent | Merge tag 'wireless-drivers-next-2021-12-23' of git://git.kernel.org/pub/scm/... (diff) | |
| parent | net: stmmac: dwmac-visconti: Fix value of ETHER_CLK_SEL_FREQ_SEL_2P5M (diff) | |
| download | linux-8b3f91332291fa280a56215f5189baca185998f5.tar.xz linux-8b3f91332291fa280a56215f5189baca185998f5.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
include/net/sock.h
commit 8f905c0e7354 ("inet: fully convert sk->sk_rx_dst to RCU rules")
commit 43f51df41729 ("net: move early demux fields close to sk_refcnt")
https://lore.kernel.org/all/20211222141641.0caa0ab3@canb.auug.org.au/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/bridge')
| -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 db4ab2c2ce18..891cfcf45644 100644 --- a/net/bridge/br_ioctl.c +++ b/net/bridge/br_ioctl.c @@ -337,7 +337,7 @@ static int old_deviceless(struct net *net, void __user *uarg) args[2] = get_bridge_ifindices(net, indices, args[2]); - ret = copy_to_user(uarg, indices, + ret = copy_to_user((void __user *)args[1], indices, array_size(args[2], sizeof(int))) ? -EFAULT : args[2]; |