diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-07-23 08:08:51 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-07-24 15:41:53 -0700 |
| commit | c6d1b26a8fd4940fe5d4199311838f6c2aef0174 (patch) | |
| tree | 2ea64e5549780cfb86999e08b180021026ade431 /net/ipv4/ip_sockglue.c | |
| parent | c8c1bbb6eb498109286739f8b6090e99313dd104 (diff) | |
| download | linux-stable-c6d1b26a8fd4940fe5d4199311838f6c2aef0174.tar.gz linux-stable-c6d1b26a8fd4940fe5d4199311838f6c2aef0174.tar.bz2 linux-stable-c6d1b26a8fd4940fe5d4199311838f6c2aef0174.zip | |
net/xfrm: switch xfrm_user_policy 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.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index a5ea02d7a183..da933f99b5d5 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c @@ -1322,7 +1322,8 @@ static int do_ip_setsockopt(struct sock *sk, int level, err = -EPERM; if (!ns_capable(sock_net(sk)->user_ns, CAP_NET_ADMIN)) break; - err = xfrm_user_policy(sk, optname, optval, optlen); + err = xfrm_user_policy(sk, optname, USER_SOCKPTR(optval), + optlen); break; case IP_TRANSPARENT: |