summaryrefslogtreecommitdiff
path: root/net/ipv4/ip_sockglue.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-07-23 08:08:56 +0200
committerDavid S. Miller <davem@davemloft.net>2020-07-24 15:41:54 -0700
commit01ccb5b48f08f59ca3746d59221f4990aec1b194 (patch)
tree4f1958c7573b7bb9293b79160a99bfa3a0a1639d /net/ipv4/ip_sockglue.c
parentb03afaa82ece13b2a008f0e3a7127bead578e3e6 (diff)
net/ipv4: switch ip_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/ipv4/ip_sockglue.c')
-rw-r--r--net/ipv4/ip_sockglue.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 36f746e01741..ac495b0cff8f 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -925,7 +925,8 @@ static int do_ip_setsockopt(struct sock *sk, int level,
if (optname == IP_ROUTER_ALERT)
return ip_ra_control(sk, val ? 1 : 0, NULL);
if (ip_mroute_opt(optname))
- return ip_mroute_setsockopt(sk, optname, optval, optlen);
+ return ip_mroute_setsockopt(sk, optname, USER_SOCKPTR(optval),
+ optlen);
err = 0;
if (needs_rtnl)