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

Commit fe50ce28 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

inet_diag: Switch the _get_exact to work with new header 



Make inet_diag_get_exact work with given header instead of calculating
one from the nl message.

The SOCK_DIAG_BY_FAMILY just passes skb's one through, the compat code
converts the old header to new one.

Signed-off-by: default avatarPavel Emelyanov <xemul@parallels.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 126fdc32

net/ipv4/inet_diag.c

+22 −7
Original line number Diff line number Diff line
@@ -261,16 +261,16 @@ static int sk_diag_fill(struct sock *sk, struct sk_buff *skb, 
}



static int inet_diag_get_exact(struct sk_buff *in_skb,

			       const struct nlmsghdr *nlh)

			       const struct nlmsghdr *nlh,

			       struct inet_diag_req *req)

{

	int err;

	struct sock *sk;

	struct inet_diag_req_compat *req = NLMSG_DATA(nlh);

	struct sk_buff *rep;

	struct inet_hashinfo *hashinfo;

	const struct inet_diag_handler *handler;



	handler = inet_diag_lock_handler(inet_diag_type2proto(nlh->nlmsg_type));

	handler = inet_diag_lock_handler(req->sdiag_protocol);

	if (IS_ERR(handler)) {

		err = PTR_ERR(handler);

		goto unlock;
@@ -279,13 +279,13 @@ static int inet_diag_get_exact(struct sk_buff *in_skb, 
	hashinfo = handler->idiag_hashinfo;

	err = -EINVAL;



	if (req->idiag_family == AF_INET) {

	if (req->sdiag_family == AF_INET) {

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

				 req->id.idiag_dport, req->id.idiag_src[0],

				 req->id.idiag_sport, req->id.idiag_if);

	}

#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)

	else if (req->idiag_family == AF_INET6) {

	else if (req->sdiag_family == AF_INET6) {

		sk = inet6_lookup(&init_net, hashinfo,

				  (struct in6_addr *)req->id.idiag_dst,

				  req->id.idiag_dport,
@@ -861,6 +861,21 @@ static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb) 
	return skb->len;

}



static int inet_diag_get_exact_compat(struct sk_buff *in_skb,

			       const struct nlmsghdr *nlh)

{

	struct inet_diag_req_compat *rc = NLMSG_DATA(nlh);

	struct inet_diag_req req;



	req.sdiag_family = rc->idiag_family;

	req.sdiag_protocol = inet_diag_type2proto(nlh->nlmsg_type);

	req.idiag_ext = rc->idiag_ext;

	req.idiag_states = rc->idiag_states;

	req.id = rc->id;



	return inet_diag_get_exact(in_skb, nlh, &req);

}



static int inet_diag_rcv_msg_compat(struct sk_buff *skb, struct nlmsghdr *nlh)

{

	int hdrlen = sizeof(struct inet_diag_req_compat);
@@ -885,7 +900,7 @@ static int inet_diag_rcv_msg_compat(struct sk_buff *skb, struct nlmsghdr *nlh) 
					  inet_diag_dump, NULL, 0);

	}



	return inet_diag_get_exact(skb, nlh);

	return inet_diag_get_exact_compat(skb, nlh);

}



static int inet_diag_handler_dump(struct sk_buff *skb, struct nlmsghdr *h)
@@ -899,7 +914,7 @@ static int inet_diag_handler_dump(struct sk_buff *skb, struct nlmsghdr *h) 
		return -EAFNOSUPPORT;

	}



	return -EAFNOSUPPORT;

	return inet_diag_get_exact(skb, h, (struct inet_diag_req *)NLMSG_DATA(h));

}



static struct sock_diag_handler inet_diag_handler = {