diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-07-23 08:08:59 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-07-25 00:41:54 +0200 |
| commit | b43c6153132c92745317f92174af84f57b160b76 (patch) | |
| tree | db2fdec6c3272519fc3fc7291e7733fa56dece40 /net/ipv6/ipv6_sockglue.c | |
| parent | net/ipv4: switch do_ip_setsockopt to sockptr_t (diff) | |
| download | linux-b43c6153132c92745317f92174af84f57b160b76.tar.xz linux-b43c6153132c92745317f92174af84f57b160b76.zip | |
net/ipv6: switch ip6_mroute_setsockopt to sockptr_t
Pass a sockptr_t to prepare for set_fs-less handling of the kernel
pointer from bpf-cgroup.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ipv6_sockglue.c')
| -rw-r--r-- | net/ipv6/ipv6_sockglue.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index 85892b35cff7..119dfaf5f4bb 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c @@ -337,7 +337,8 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, valbool = (val != 0); if (ip6_mroute_opt(optname)) - return ip6_mroute_setsockopt(sk, optname, optval, optlen); + return ip6_mroute_setsockopt(sk, optname, USER_SOCKPTR(optval), + optlen); if (needs_rtnl) rtnl_lock(); |