diff options
| author | Cong Wang <cong.wang@bytedance.com> | 2021-07-04 12:02:46 -0700 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2021-07-15 18:17:50 -0700 |
| commit | c7272e15f0f18d6e0f423b53207eac7a27ed5a49 (patch) | |
| tree | 01eb32d0527511f6ec585b6f4bda65d7db24316b /net/unix | |
| parent | 83301b5367a98c17ec0d76c7bc0ccdc3c7e7ad6d (diff) | |
| download | linux-c7272e15f0f18d6e0f423b53207eac7a27ed5a49.tar.gz | |
af_unix: Add a dummy ->close() for sockmap
Unlike af_inet, unix_proto is very different, it does not even
have a ->close(). We have to add a dummy implementation to
satisfy sockmap. Normally it is just a nop, it is introduced only
for sockmap to replace it.
Signed-off-by: Cong Wang <cong.wang@bytedance.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20210704190252.11866-6-xiyou.wangcong@gmail.com
Diffstat (limited to 'net/unix')
| -rw-r--r-- | net/unix/af_unix.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 77fb3910e1c3e..875eeaaddc07e 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -781,10 +781,18 @@ static const struct proto_ops unix_seqpacket_ops = { .show_fdinfo = unix_show_fdinfo, }; +static void unix_close(struct sock *sk, long timeout) +{ + /* Nothing to do here, unix socket does not need a ->close(). + * This is merely for sockmap. + */ +} + static struct proto unix_proto = { .name = "UNIX", .owner = THIS_MODULE, .obj_size = sizeof(struct unix_sock), + .close = unix_close, }; static struct sock *unix_create1(struct net *net, struct socket *sock, int kern) @@ -868,6 +876,7 @@ static int unix_release(struct socket *sock) if (!sk) return 0; + sk->sk_prot->close(sk, 0); unix_release_sock(sk, 0); sock->sk = NULL; |