android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

inet_diag: Switch the _get_exact to work with new header

Browse Source 
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: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pavel Emelyanov
2011-12-06 07:58:39 +00:00
committed by David S. Miller
parent 126fdc3249
commit fe50ce2846
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
net/ipv4/inet_diag.c
View File

@ -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, 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; int err;
struct sock *sk; struct sock *sk;
struct inet_diag_req_compat *req = NLMSG_DATA(nlh);
struct sk_buff *rep; struct sk_buff *rep;
struct inet_hashinfo *hashinfo; struct inet_hashinfo *hashinfo;
const struct inet_diag_handler *handler; 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)) { if (IS_ERR(handler)) {
err = PTR_ERR(handler); err = PTR_ERR(handler);
goto unlock; goto unlock;
@ -279,13 +279,13 @@ static int inet_diag_get_exact(struct sk_buff *in_skb,
hashinfo = handler->idiag_hashinfo; hashinfo = handler->idiag_hashinfo;
err = -EINVAL; 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], sk = inet_lookup(&init_net, hashinfo, req->id.idiag_dst[0],
req->id.idiag_dport, req->id.idiag_src[0], req->id.idiag_dport, req->id.idiag_src[0],
req->id.idiag_sport, req->id.idiag_if); req->id.idiag_sport, req->id.idiag_if);
} }
#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) #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, sk = inet6_lookup(&init_net, hashinfo,
(struct in6_addr *)req->id.idiag_dst, (struct in6_addr *)req->id.idiag_dst,
req->id.idiag_dport, req->id.idiag_dport,
@ -861,6 +861,21 @@ unlock:
return skb->len; 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) static int inet_diag_rcv_msg_compat(struct sk_buff *skb, struct nlmsghdr *nlh)
{ {
int hdrlen = sizeof(struct inet_diag_req_compat); 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); 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) 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 -EAFNOSUPPORT; return inet_diag_get_exact(skb, h, (struct inet_diag_req *)NLMSG_DATA(h));
} }
static struct sock_diag_handler inet_diag_handler = { static struct sock_diag_handler inet_diag_handler = {