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

Commit 0feeab86 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Subash Abhinov Kasiviswanathan
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.

[Backport of net-next 64be0aed59ad519d6f2160868734f7e278290ac1]

CRs-fixed: 1009682
Change-Id: I24f4a157e0a2cdb267317920aa230cc6528ca072
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>
Git-commit: 194c5f31
Git-repo: https://android.googlesource.com/kernel/common/


Signed-off-by: default avatarJerome Stanislaus <jeromes@codeaurora.org>
parent 079a5462

include/linux/sock_diag.h

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ struct sock; 
struct sock_diag_handler {

	__u8 family;

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

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

};



int sock_diag_register(const struct sock_diag_handler *h);
@@ -26,4 +27,5 @@ int sock_diag_put_meminfo(struct sock *sk, struct sk_buff *skb, int attr); 
int sock_diag_put_filterinfo(bool may_report_filterinfo, struct sock *sk,

			     struct sk_buff *skb, int attrtype);



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

#endif

include/net/sock.h

+1 −0
Original line number Diff line number Diff line
@@ -1049,6 +1049,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);

};



/*

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_BACKPORT 21



struct sock_diag_req {

	__u8	sdiag_family;

net/core/sock_diag.c

+20 −3
Original line number Diff line number Diff line
@@ -132,7 +132,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);
@@ -152,8 +152,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_BACKPORT && hndl->destroy)

		err = hndl->destroy(skb, nlh);

	else

		err = -EOPNOTSUPP;

	mutex_unlock(&sock_diag_table_mutex);



	return err;
@@ -179,7 +183,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_BACKPORT:

		return __sock_diag_cmd(skb, nlh);

	default:

		return -EINVAL;

	}
@@ -194,6 +199,18 @@ static void sock_diag_rcv(struct sk_buff *skb) 
	mutex_unlock(&sock_diag_mutex);

}



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 = {