Skip to content

Commit

Permalink
inet_diag: Switch the _dump to work with new header
Browse files Browse the repository at this point in the history 
Make inet_diag_dumo 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.

Also fix the bytecode calculation to find one at proper offset.

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Pavel Emelyanov authored and David S. Miller committed Dec 6, 2011
1 parent fe50ce2 commit 25c4cd2
Showing 1 changed file with 53 additions and 18 deletions.
71 changes: 53 additions & 18 deletions net/ipv4/inet_diag.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -502,10 +502,9 @@ static int inet_diag_bc_audit(const void *bytecode, int bytecode_len)
static int inet_csk_diag_dump(struct sock *sk,
struct sk_buff *skb,
struct netlink_callback *cb,
struct inet_diag_req *r,
const struct nlattr *bc)
{
struct inet_diag_req_compat *r = NLMSG_DATA(cb->nlh);

if (bc != NULL) {
struct inet_diag_entry entry;
struct inet_sock *inet = inet_sk(sk);
Expand Down Expand Up @@ -539,10 +538,9 @@ static int inet_csk_diag_dump(struct sock *sk,
static int inet_twsk_diag_dump(struct inet_timewait_sock *tw,
struct sk_buff *skb,
struct netlink_callback *cb,
struct inet_diag_req *r,
const struct nlattr *bc)
{
struct inet_diag_req_compat *r = NLMSG_DATA(cb->nlh);

if (bc != NULL) {
struct inet_diag_entry entry;

Expand Down Expand Up @@ -626,10 +624,10 @@ static int inet_diag_fill_req(struct sk_buff *skb, struct sock *sk,

static int inet_diag_dump_reqs(struct sk_buff *skb, struct sock *sk,
struct netlink_callback *cb,
struct inet_diag_req *r,
const struct nlattr *bc)
{
struct inet_diag_entry entry;
struct inet_diag_req_compat *r = NLMSG_DATA(cb->nlh);
struct inet_connection_sock *icsk = inet_csk(sk);
struct listen_sock *lopt;
struct inet_sock *inet = inet_sk(sk);
Expand Down Expand Up @@ -708,19 +706,15 @@ static int inet_diag_dump_reqs(struct sk_buff *skb, struct sock *sk,
return err;
}

static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
static int __inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,
struct inet_diag_req *r, struct nlattr *bc)
{
int i, num;
int s_i, s_num;
struct inet_diag_req_compat *r = NLMSG_DATA(cb->nlh);
const struct inet_diag_handler *handler;
struct inet_hashinfo *hashinfo;
const struct nlattr *bc = NULL;

if (nlmsg_attrlen(cb->nlh, sizeof(struct inet_diag_req_compat)))
bc = nlmsg_find_attr(cb->nlh, sizeof(*r), INET_DIAG_REQ_BYTECODE);

handler = inet_diag_lock_handler(inet_diag_type2proto(cb->nlh->nlmsg_type));
handler = inet_diag_lock_handler(r->sdiag_protocol);
if (IS_ERR(handler))
goto unlock;

Expand Down Expand Up @@ -758,7 +752,7 @@ static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
cb->args[3] > 0)
goto syn_recv;

if (inet_csk_diag_dump(sk, skb, cb, bc) < 0) {
if (inet_csk_diag_dump(sk, skb, cb, r, bc) < 0) {
spin_unlock_bh(&ilb->lock);
goto done;
}
Expand All @@ -767,7 +761,7 @@ static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
if (!(r->idiag_states & TCPF_SYN_RECV))
goto next_listen;

if (inet_diag_dump_reqs(skb, sk, cb, bc) < 0) {
if (inet_diag_dump_reqs(skb, sk, cb, r, bc) < 0) {
spin_unlock_bh(&ilb->lock);
goto done;
}
Expand Down Expand Up @@ -820,7 +814,7 @@ static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
if (r->id.idiag_dport != inet->inet_dport &&
r->id.idiag_dport)
goto next_normal;
if (inet_csk_diag_dump(sk, skb, cb, bc) < 0) {
if (inet_csk_diag_dump(sk, skb, cb, r, bc) < 0) {
spin_unlock_bh(lock);
goto done;
}
Expand All @@ -842,7 +836,7 @@ static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
if (r->id.idiag_dport != tw->tw_dport &&
r->id.idiag_dport)
goto next_dying;
if (inet_twsk_diag_dump(tw, skb, cb, bc) < 0) {
if (inet_twsk_diag_dump(tw, skb, cb, r, bc) < 0) {
spin_unlock_bh(lock);
goto done;
}
Expand All @@ -861,6 +855,36 @@ static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
return skb->len;
}

static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
{
struct nlattr *bc = NULL;
int hdrlen = sizeof(struct inet_diag_req);

if (nlmsg_attrlen(cb->nlh, hdrlen))
bc = nlmsg_find_attr(cb->nlh, hdrlen, INET_DIAG_REQ_BYTECODE);

return __inet_diag_dump(skb, cb, (struct inet_diag_req *)NLMSG_DATA(cb->nlh), bc);
}

static int inet_diag_dump_compat(struct sk_buff *skb, struct netlink_callback *cb)
{
struct inet_diag_req_compat *rc = NLMSG_DATA(cb->nlh);
struct inet_diag_req req;
struct nlattr *bc = NULL;
int hdrlen = sizeof(struct inet_diag_req_compat);

req.sdiag_family = rc->idiag_family;
req.sdiag_protocol = inet_diag_type2proto(cb->nlh->nlmsg_type);
req.idiag_ext = rc->idiag_ext;
req.idiag_states = rc->idiag_states;
req.id = rc->id;

if (nlmsg_attrlen(cb->nlh, hdrlen))
bc = nlmsg_find_attr(cb->nlh, hdrlen, INET_DIAG_REQ_BYTECODE);

return __inet_diag_dump(skb, cb, &req, bc);
}

static int inet_diag_get_exact_compat(struct sk_buff *in_skb,
const struct nlmsghdr *nlh)
{
Expand Down Expand Up @@ -897,7 +921,7 @@ static int inet_diag_rcv_msg_compat(struct sk_buff *skb, struct nlmsghdr *nlh)
}

return netlink_dump_start(sdiagnl, skb, nlh,
inet_diag_dump, NULL, 0);
inet_diag_dump_compat, NULL, 0);
}

return inet_diag_get_exact_compat(skb, nlh);
Expand All @@ -911,7 +935,18 @@ static int inet_diag_handler_dump(struct sk_buff *skb, struct nlmsghdr *h)
return -EINVAL;

if (h->nlmsg_flags & NLM_F_DUMP) {
return -EAFNOSUPPORT;
if (nlmsg_attrlen(h, hdrlen)) {
struct nlattr *attr;
attr = nlmsg_find_attr(h, hdrlen,
INET_DIAG_REQ_BYTECODE);
if (attr == NULL ||
nla_len(attr) < sizeof(struct inet_diag_bc_op) ||
inet_diag_bc_audit(nla_data(attr), nla_len(attr)))
return -EINVAL;
}

return netlink_dump_start(sdiagnl, skb, h,
inet_diag_dump, NULL, 0);
}

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

0 comments on commit 25c4cd2

Please sign in to comment.