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

Commit 0d29a255 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Subash Abhinov Kasiviswanathan
Browse files

net: diag: Support SOCK_DESTROY for inet sockets. 



This passes the SOCK_DESTROY operation to the underlying protocol
diag handler, or returns -EOPNOTSUPP if that handler does not
define a destroy operation.

Most of this patch is just renaming functions. This is not
strictly necessary, but it would be fairly counterintuitive to
have the code to destroy inet sockets be in a function whose name
starts with inet_diag_get.

[Backport of net-next 6eb5d2e08f071c05ecbe135369c9ad418826cab2]

CRs-fixed: 1009682
Change-Id: If50e5dd38dbb9e421ad7146f34778b5a143ff58d
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: 8387ea26
Git-repo: https://android.googlesource.com/kernel/common/


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

include/linux/inet_diag.h

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,10 @@ struct inet_diag_handler { 
	void			(*idiag_get_info)(struct sock *sk,

						  struct inet_diag_msg *r,

						  void *info);



	int			(*destroy)(struct sk_buff *in_skb,

					   struct inet_diag_req_v2 *req);



	__u16                   idiag_type;

};

net/ipv4/inet_diag.c

+15 −8
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ out: 
}

EXPORT_SYMBOL_GPL(inet_diag_dump_one_icsk);



static int inet_diag_get_exact(struct sk_buff *in_skb,

static int inet_diag_cmd_exact(int cmd, struct sk_buff *in_skb,

			       const struct nlmsghdr *nlh,

			       struct inet_diag_req_v2 *req)

{
@@ -391,8 +391,12 @@ static int inet_diag_get_exact(struct sk_buff *in_skb, 
	handler = inet_diag_lock_handler(req->sdiag_protocol);

	if (IS_ERR(handler))

		err = PTR_ERR(handler);

	else

	else if (cmd == SOCK_DIAG_BY_FAMILY)

		err = handler->dump_one(in_skb, nlh, req);

	else if (cmd == SOCK_DESTROY_BACKPORT && handler->destroy)

		err = handler->destroy(in_skb, req);

	else

		err = -EOPNOTSUPP;

	inet_diag_unlock_handler(handler);



	return err;
@@ -1068,7 +1072,7 @@ static int inet_diag_get_exact_compat(struct sk_buff *in_skb, 
	req.idiag_states = rc->idiag_states;

	req.id = rc->id;



	return inet_diag_get_exact(in_skb, nlh, &req);

	return inet_diag_cmd_exact(SOCK_DIAG_BY_FAMILY, in_skb, nlh, &req);

}



static int inet_diag_rcv_msg_compat(struct sk_buff *skb, struct nlmsghdr *nlh)
@@ -1102,7 +1106,7 @@ static int inet_diag_rcv_msg_compat(struct sk_buff *skb, struct nlmsghdr *nlh) 
	return inet_diag_get_exact_compat(skb, nlh);

}



static int inet_diag_handler_dump(struct sk_buff *skb, struct nlmsghdr *h)

static int inet_diag_handler_cmd(struct sk_buff *skb, struct nlmsghdr *h)

{

	int hdrlen = sizeof(struct inet_diag_req_v2);

	struct net *net = sock_net(skb->sk);
@@ -1110,7 +1114,8 @@ static int inet_diag_handler_dump(struct sk_buff *skb, struct nlmsghdr *h) 
	if (nlmsg_len(h) < hdrlen)

		return -EINVAL;



	if (h->nlmsg_flags & NLM_F_DUMP) {

	if (h->nlmsg_type == SOCK_DIAG_BY_FAMILY &&

	    h->nlmsg_flags & NLM_F_DUMP) {

		if (nlmsg_attrlen(h, hdrlen)) {

			struct nlattr *attr;

			attr = nlmsg_find_attr(h, hdrlen,
@@ -1128,17 +1133,19 @@ static int inet_diag_handler_dump(struct sk_buff *skb, struct nlmsghdr *h) 
		}

	}



	return inet_diag_get_exact(skb, h, nlmsg_data(h));

	return inet_diag_cmd_exact(h->nlmsg_type, skb, h, nlmsg_data(h));

}



static const struct sock_diag_handler inet_diag_handler = {

	.family = AF_INET,

	.dump = inet_diag_handler_dump,

	.dump = inet_diag_handler_cmd,

	.destroy = inet_diag_handler_cmd,

};



static const struct sock_diag_handler inet6_diag_handler = {

	.family = AF_INET6,

	.dump = inet_diag_handler_dump,

	.dump = inet_diag_handler_cmd,

	.destroy = inet_diag_handler_cmd,

};



int inet_diag_register(const struct inet_diag_handler *h)