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

Commit 100263d6 authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

net: diag: split inet_diag_dump_one_icsk into two 



Currently, inet_diag_dump_one_icsk finds a socket and then dumps
its information to userspace. Split it into a part that finds the
socket and a part that dumps the information.

[Backport of net-next b613f56ec9baf30edf5d9d607b822532a273dad7]

Change-Id: I9218ab7f71d18f9a74726a0b9caa48fd604b0bb3
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 8246f189

include/linux/inet_diag.h

+5 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include <uapi/linux/inet_diag.h>



struct net;

struct sock;

struct inet_hashinfo;

struct nlattr;
@@ -39,6 +40,10 @@ int inet_diag_dump_one_icsk(struct inet_hashinfo *hashinfo, 
		struct sk_buff *in_skb, const struct nlmsghdr *nlh,

		struct inet_diag_req_v2 *req);



struct sock *inet_diag_find_one_icsk(struct net *net,

				     struct inet_hashinfo *hashinfo,

				     struct inet_diag_req_v2 *req);



int inet_diag_bc_sk(const struct nlattr *_bc, struct sock *sk);



extern int  inet_diag_register(const struct inet_diag_handler *handler);

net/ipv4/inet_diag.c

+28 −14
Original line number Diff line number Diff line
@@ -288,15 +288,12 @@ static int sk_diag_fill(struct sock *sk, struct sk_buff *skb, 
				  nlmsg_flags, unlh);

}



int inet_diag_dump_one_icsk(struct inet_hashinfo *hashinfo, struct sk_buff *in_skb,

		const struct nlmsghdr *nlh, struct inet_diag_req_v2 *req)

struct sock *inet_diag_find_one_icsk(struct net *net,

				     struct inet_hashinfo *hashinfo,

				     struct inet_diag_req_v2 *req)

{

	int err;

	struct sock *sk;

	struct sk_buff *rep;

	struct net *net = sock_net(in_skb->sk);



	err = -EINVAL;

	if (req->sdiag_family == AF_INET) {

		sk = inet_lookup(net, hashinfo, req->id.idiag_dst[0],

				 req->id.idiag_dport, req->id.idiag_src[0],
@@ -313,16 +310,34 @@ int inet_diag_dump_one_icsk(struct inet_hashinfo *hashinfo, struct sk_buff *in_s 
	}

#endif

	else {

		goto out_nosk;

		return ERR_PTR(-EINVAL);

	}



	err = -ENOENT;

	if (sk == NULL)

		goto out_nosk;

	if (!sk)

		return ERR_PTR(-ENOENT);



	err = sock_diag_check_cookie(sk, req->id.idiag_cookie);

	if (err)

		goto out;

	if (sock_diag_check_cookie(sk, req->id.idiag_cookie)) {

		sock_gen_put(sk);

		return ERR_PTR(-ENOENT);

	}



	return sk;

}

EXPORT_SYMBOL_GPL(inet_diag_find_one_icsk);



int inet_diag_dump_one_icsk(struct inet_hashinfo *hashinfo,

			    struct sk_buff *in_skb,

			    const struct nlmsghdr *nlh,

			    struct inet_diag_req_v2 *req)

{

	struct net *net = sock_net(in_skb->sk);

	struct sk_buff *rep;

	struct sock *sk;

	int err;



	sk = inet_diag_find_one_icsk(net, hashinfo, req);

	if (IS_ERR(sk))

		return PTR_ERR(sk);



	rep = nlmsg_new(sizeof(struct inet_diag_msg) +

			sizeof(struct inet_diag_meminfo) +
@@ -350,7 +365,6 @@ out: 
	if (sk)

		sock_gen_put(sk);



out_nosk:

	return err;

}

EXPORT_SYMBOL_GPL(inet_diag_dump_one_icsk);