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

Commit cb2050a7 authored by Xin Long's avatar Xin Long Committed by David S. Miller
Browse files

sctp: export some functions for sctp_diag in inet_diag 



inet_diag_msg_common_fill is used to fill the diag msg common info,
we need to use it in sctp_diag as well, so export it.

inet_diag_msg_attrs_fill is used to fill some common attrs info between
sctp diag and tcp diag.

v2->v3:
- do not need to define and export inet_diag_get_handler any more.
  cause all the functions in it are in sctp_diag.ko, we just call
  them in sctp_diag.ko.

- add inet_diag_msg_attrs_fill to make codes clear.

Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 626d16f5

net/ipv4/inet_diag.c

+41 −26
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static void inet_diag_unlock_handler(const struct inet_diag_handler *handler) 
	mutex_unlock(&inet_diag_table_mutex);

}



static void inet_diag_msg_common_fill(struct inet_diag_msg *r, struct sock *sk)

void inet_diag_msg_common_fill(struct inet_diag_msg *r, struct sock *sk)

{

	r->idiag_family = sk->sk_family;
@@ -89,6 +89,7 @@ static void inet_diag_msg_common_fill(struct inet_diag_msg *r, struct sock *sk) 
	r->id.idiag_dst[0] = sk->sk_daddr;

	}

}

EXPORT_SYMBOL_GPL(inet_diag_msg_common_fill);



static size_t inet_sk_attr_size(void)

{
@@ -104,13 +105,50 @@ static size_t inet_sk_attr_size(void) 
		+ 64;

}



int inet_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb,

			     struct inet_diag_msg *r, int ext,

			     struct user_namespace *user_ns)

{

	const struct inet_sock *inet = inet_sk(sk);



	if (nla_put_u8(skb, INET_DIAG_SHUTDOWN, sk->sk_shutdown))

		goto errout;



	/* IPv6 dual-stack sockets use inet->tos for IPv4 connections,

	 * hence this needs to be included regardless of socket family.

	 */

	if (ext & (1 << (INET_DIAG_TOS - 1)))

		if (nla_put_u8(skb, INET_DIAG_TOS, inet->tos) < 0)

			goto errout;



#if IS_ENABLED(CONFIG_IPV6)

	if (r->idiag_family == AF_INET6) {

		if (ext & (1 << (INET_DIAG_TCLASS - 1)))

			if (nla_put_u8(skb, INET_DIAG_TCLASS,

				       inet6_sk(sk)->tclass) < 0)

				goto errout;



		if (((1 << sk->sk_state) & (TCPF_LISTEN | TCPF_CLOSE)) &&

		    nla_put_u8(skb, INET_DIAG_SKV6ONLY, ipv6_only_sock(sk)))

			goto errout;

	}

#endif



	r->idiag_uid = from_kuid_munged(user_ns, sock_i_uid(sk));

	r->idiag_inode = sock_i_ino(sk);



	return 0;

errout:

	return 1;

}

EXPORT_SYMBOL_GPL(inet_diag_msg_attrs_fill);



int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk,

		      struct sk_buff *skb, const struct inet_diag_req_v2 *req,

		      struct user_namespace *user_ns,

		      u32 portid, u32 seq, u16 nlmsg_flags,

		      const struct nlmsghdr *unlh)

{

	const struct inet_sock *inet = inet_sk(sk);

	const struct tcp_congestion_ops *ca_ops;

	const struct inet_diag_handler *handler;

	int ext = req->idiag_ext;
@@ -135,32 +173,9 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk, 
	r->idiag_timer = 0;

	r->idiag_retrans = 0;



	if (nla_put_u8(skb, INET_DIAG_SHUTDOWN, sk->sk_shutdown))

	if (inet_diag_msg_attrs_fill(sk, skb, r, ext, user_ns))

		goto errout;



	/* IPv6 dual-stack sockets use inet->tos for IPv4 connections,

	 * hence this needs to be included regardless of socket family.

	 */

	if (ext & (1 << (INET_DIAG_TOS - 1)))

		if (nla_put_u8(skb, INET_DIAG_TOS, inet->tos) < 0)

			goto errout;



#if IS_ENABLED(CONFIG_IPV6)

	if (r->idiag_family == AF_INET6) {

		if (ext & (1 << (INET_DIAG_TCLASS - 1)))

			if (nla_put_u8(skb, INET_DIAG_TCLASS,

				       inet6_sk(sk)->tclass) < 0)

				goto errout;



		if (((1 << sk->sk_state) & (TCPF_LISTEN | TCPF_CLOSE)) &&

		    nla_put_u8(skb, INET_DIAG_SKV6ONLY, ipv6_only_sock(sk)))

			goto errout;

	}

#endif



	r->idiag_uid = from_kuid_munged(user_ns, sock_i_uid(sk));

	r->idiag_inode = sock_i_ino(sk);



	if (ext & (1 << (INET_DIAG_MEMINFO - 1))) {

		struct inet_diag_meminfo minfo = {

			.idiag_rmem = sk_rmem_alloc_get(sk),