Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64be0aed authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by David S. Miller
Browse files

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



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: default avatarLorenzo Colitti <lorenzo@google.com>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b613f56e

include/linux/sock_diag.h

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ struct sock_diag_handler { 
	__u8 family;

	int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);

	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);
@@ -68,4 +69,5 @@ bool sock_diag_has_destroy_listeners(const struct sock *sk) 
}

void sock_diag_broadcast_destroy(struct sock *sk);



int sock_diag_destroy(struct sock *sk, int err);

#endif

include/net/sock.h

+1 −0
Original line number Diff line number Diff line
@@ -1060,6 +1060,7 @@ struct proto { 
	void			(*destroy_cgroup)(struct mem_cgroup *memcg);

	struct cg_proto		*(*proto_cgroup)(struct mem_cgroup *memcg);

#endif

	int			(*diag_destroy)(struct sock *sk, int err);

};



int proto_register(struct proto *prot, int alloc_slab);

include/uapi/linux/sock_diag.h

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/types.h>



#define SOCK_DIAG_BY_FAMILY 20

#define SOCK_DESTROY 21



struct sock_diag_req {

	__u8	sdiag_family;

net/core/sock_diag.c

+20 −3
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld) 
}

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;

	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];

	if (hndl == NULL)

		err = -ENOENT;

	else

	else if (nlh->nlmsg_type == SOCK_DIAG_BY_FAMILY)

		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);



	return err;
@@ -261,7 +265,8 @@ static int sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) 


		return ret;

	case SOCK_DIAG_BY_FAMILY:

		return __sock_diag_rcv_msg(skb, nlh);

	case SOCK_DESTROY:

		return __sock_diag_cmd(skb, nlh);

	default:

		return -EINVAL;

	}
@@ -295,6 +300,18 @@ static int sock_diag_bind(struct net *net, int group) 
	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)

{

	struct netlink_kernel_cfg cfg = {