iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: diag: Add the ability to destroy a socket.

Browse Source 
This patch adds a SOCK_DESTROY operation, a destroy function
pointer to sock_diag_handler, and a diag_destroy function
pointer.  It does not include any implementation code.

Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Lorenzo Colitti 2015-12-16 12:30:03 +09:00 committed by David S. Miller
parent b613f56ec9
commit 64be0aed59
4 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/sock_diag.h
View File

@ -15,6 +15,7 @@ struct sock_diag_handler {
__u8 family; __u8 family;
int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh); int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
int (*get_info)(struct sk_buff *skb, struct sock *sk); int (*get_info)(struct sk_buff *skb, struct sock *sk);
int (*destroy)(struct sk_buff *skb, struct nlmsghdr *nlh);
}; };
int sock_diag_register(const struct sock_diag_handler *h); int sock_diag_register(const struct sock_diag_handler *h);
@ -68,4 +69,5 @@ bool sock_diag_has_destroy_listeners(const struct sock *sk)
} }
void sock_diag_broadcast_destroy(struct sock *sk); void sock_diag_broadcast_destroy(struct sock *sk);
int sock_diag_destroy(struct sock *sk, int err);
#endif #endif

1
include/net/sock.h
View File

@ -1060,6 +1060,7 @@ struct proto {
void (*destroy_cgroup)(struct mem_cgroup *memcg); void (*destroy_cgroup)(struct mem_cgroup *memcg);
struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg); struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg);
#endif #endif
int (*diag_destroy)(struct sock *sk, int err);
}; };
int proto_register(struct proto *prot, int alloc_slab); int proto_register(struct proto *prot, int alloc_slab);

1
include/uapi/linux/sock_diag.h
View File

@ -4,6 +4,7 @@
#include <linux/types.h> #include <linux/types.h>
#define SOCK_DIAG_BY_FAMILY 20 #define SOCK_DIAG_BY_FAMILY 20
#define SOCK_DESTROY 21
struct sock_diag_req { struct sock_diag_req {
__u8 sdiag_family; __u8 sdiag_family;

23
net/core/sock_diag.c
View File

@ -214,7 +214,7 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
} }
EXPORT_SYMBOL_GPL(sock_diag_unregister); EXPORT_SYMBOL_GPL(sock_diag_unregister);
static int __sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) static int __sock_diag_cmd(struct sk_buff *skb, struct nlmsghdr *nlh)
{ {
int err; int err;
struct sock_diag_req *req = nlmsg_data(nlh); struct sock_diag_req *req = nlmsg_data(nlh);
@ -234,8 +234,12 @@ static int __sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
hndl = sock_diag_handlers[req->sdiag_family]; hndl = sock_diag_handlers[req->sdiag_family];
if (hndl == NULL) if (hndl == NULL)
err = -ENOENT; err = -ENOENT;
else else if (nlh->nlmsg_type == SOCK_DIAG_BY_FAMILY)
err = hndl->dump(skb, nlh); err = hndl->dump(skb, nlh);
else if (nlh->nlmsg_type == SOCK_DESTROY && hndl->destroy)
err = hndl->destroy(skb, nlh);
else
err = -EOPNOTSUPP;
mutex_unlock(&sock_diag_table_mutex); mutex_unlock(&sock_diag_table_mutex);
return err; return err;
@ -261,7 +265,8 @@ static int sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
return ret; return ret;
case SOCK_DIAG_BY_FAMILY: case SOCK_DIAG_BY_FAMILY:
return __sock_diag_rcv_msg(skb, nlh); case SOCK_DESTROY:
return __sock_diag_cmd(skb, nlh);
default: default:
return -EINVAL; return -EINVAL;
} }
@ -295,6 +300,18 @@ static int sock_diag_bind(struct net *net, int group)
return 0; return 0;
} }
int sock_diag_destroy(struct sock *sk, int err)
{
if (!ns_capable(sock_net(sk)->user_ns, CAP_NET_ADMIN))
return -EPERM;
if (!sk->sk_prot->diag_destroy)
return -EOPNOTSUPP;
return sk->sk_prot->diag_destroy(sk, err);
}
EXPORT_SYMBOL_GPL(sock_diag_destroy);
static int __net_init diag_net_init(struct net *net) static int __net_init diag_net_init(struct net *net)
{ {
struct netlink_kernel_cfg cfg = { struct netlink_kernel_cfg cfg = {