diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-10-29 14:08:40 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-10-29 14:08:40 -0700 |
| commit | 1c29d9899081d090cbe2aab128e527354af7f343 (patch) | |
| tree | 83e3376286d1a808d3f73276750b558776c272ac /net/vmw_vsock | |
| parent | cd29296fdfca919590e4004a7e4905544f4c4a32 (diff) | |
| parent | 07e0887302450a62f51dba72df6afb5fabb23d1c (diff) | |
| download | linux-1c29d9899081d090cbe2aab128e527354af7f343.tar.gz linux-1c29d9899081d090cbe2aab128e527354af7f343.tar.bz2 linux-1c29d9899081d090cbe2aab128e527354af7f343.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/vmw_vsock')
| -rw-r--r-- | net/vmw_vsock/af_vsock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index 9e93bc201cc0..b4d7b8aba003 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -739,7 +739,7 @@ static struct sock *__vsock_create(struct net *net, vsk->buffer_min_size = psk->buffer_min_size; vsk->buffer_max_size = psk->buffer_max_size; } else { - vsk->trusted = capable(CAP_NET_ADMIN); + vsk->trusted = ns_capable_noaudit(&init_user_ns, CAP_NET_ADMIN); vsk->owner = get_current_cred(); vsk->connect_timeout = VSOCK_DEFAULT_CONNECT_TIMEOUT; vsk->buffer_size = VSOCK_DEFAULT_BUFFER_SIZE; |