lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[IPv4] diag: Use netlink_run_queue() to process the receive queue

Browse Source 
Makes use of netlink_run_queue() to process the receive queue and
converts inet_diag_rcv_msg() to use the type safe netlink interface.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Thomas Graf
2007-03-22 23:30:35 -07:00
committed by David S. Miller
parent 1d00a4eb42
commit ead592ba24
1 changed files with 28 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
net/ipv4/inet_diag.c
View File

@@ -806,68 +806,48 @@ done:
return skb->len; return skb->len;
} }
static inline int inet_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) static int inet_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
{ {
if (!(nlh->nlmsg_flags&NLM_F_REQUEST)) int hdrlen = sizeof(struct inet_diag_req);
return 0;
if (nlh->nlmsg_type >= INET_DIAG_GETSOCK_MAX) if (nlh->nlmsg_type >= INET_DIAG_GETSOCK_MAX ||
goto err_inval; nlmsg_len(nlh) < hdrlen)
return -EINVAL;
if (inet_diag_table[nlh->nlmsg_type] == NULL) if (inet_diag_table[nlh->nlmsg_type] == NULL)
return -ENOENT; return -ENOENT;
if (NLMSG_LENGTH(sizeof(struct inet_diag_req)) > skb->len) if (nlh->nlmsg_flags & NLM_F_DUMP) {
goto err_inval;
if (nlh->nlmsg_flags&NLM_F_DUMP) {
if (nlh->nlmsg_len >
(4 + NLMSG_SPACE(sizeof(struct inet_diag_req)))) {
struct rtattr *rta = (void *)(NLMSG_DATA(nlh) +
sizeof(struct inet_diag_req));
if (rta->rta_type != INET_DIAG_REQ_BYTECODE ||
rta->rta_len < 8 ||
rta->rta_len >
(nlh->nlmsg_len -
NLMSG_SPACE(sizeof(struct inet_diag_req))))
goto err_inval;
if (inet_diag_bc_audit(RTA_DATA(rta), RTA_PAYLOAD(rta)))
goto err_inval;
}
return netlink_dump_start(idiagnl, skb, nlh,
inet_diag_dump, NULL);
} else
return inet_diag_get_exact(skb, nlh);
err_inval:
return -EINVAL;
}
static inline void inet_diag_rcv_skb(struct sk_buff *skb)
{
if (skb->len >= NLMSG_SPACE(0)) {
int err; int err;
struct nlmsghdr *nlh = nlmsg_hdr(skb);
if (nlh->nlmsg_len < sizeof(*nlh) || if (nlmsg_attrlen(nlh, hdrlen)) {
skb->len < nlh->nlmsg_len) struct nlattr *attr;
return;
err = inet_diag_rcv_msg(skb, nlh); attr = nlmsg_find_attr(nlh, hdrlen,
if (err || nlh->nlmsg_flags & NLM_F_ACK) INET_DIAG_REQ_BYTECODE);
netlink_ack(skb, nlh, err); if (attr == NULL ||
nla_len(attr) < sizeof(struct inet_diag_bc_op) ||
inet_diag_bc_audit(nla_data(attr), nla_len(attr)))
return -EINVAL;
}
err = netlink_dump_start(idiagnl, skb, nlh,
inet_diag_dump, NULL);
if (err == 0)
err = -EINTR;
return err;
} }
return inet_diag_get_exact(skb, nlh);
} }
static void inet_diag_rcv(struct sock *sk, int len) static void inet_diag_rcv(struct sock *sk, int len)
{ {
struct sk_buff *skb; unsigned int qlen = 0;
unsigned int qlen = skb_queue_len(&sk->sk_receive_queue);
while (qlen-- && (skb = skb_dequeue(&sk->sk_receive_queue))) { do {
inet_diag_rcv_skb(skb); netlink_run_queue(sk, &qlen, &inet_diag_rcv_msg);
kfree_skb(skb); } while (qlen);
}
} }
static DEFINE_SPINLOCK(inet_diag_register_lock); static DEFINE_SPINLOCK(inet_diag_register_lock);