kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

inet_diag: Cleanup type2proto last user

Browse source 
Now all the code works with sock_diag_req-compatible structs, so it's
possible to stop using the inet_diag_type2proto in inet_csk_diag_fill.
Pass the inet_diag_req into it and use the sdiag_protocol field. At the
same time remove the explicit ext argument, since it's also on the req.

However, this conversion is still required in _compat code, so just move
this routine, not remove.

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:59:32 +00:00 committed by David S. Miller
parent d23deaa07b
commit a029fe26b6
1 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
net/ipv4/inet_diag.c
View file

@ -51,18 +51,6 @@ static struct sock *sdiagnl;
#define INET_DIAG_PUT(skb, attrtype, attrlen) \ #define INET_DIAG_PUT(skb, attrtype, attrlen) \
RTA_DATA(__RTA_PUT(skb, attrtype, attrlen)) RTA_DATA(__RTA_PUT(skb, attrtype, attrlen))
static inline int inet_diag_type2proto(int type)
{
switch (type) {
case TCPDIAG_GETSOCK:
return IPPROTO_TCP;
case DCCPDIAG_GETSOCK:
return IPPROTO_DCCP;
default:
return 0;
}
}
static DEFINE_MUTEX(inet_diag_table_mutex); static DEFINE_MUTEX(inet_diag_table_mutex);
static const struct inet_diag_handler *inet_diag_lock_handler(int proto) static const struct inet_diag_handler *inet_diag_lock_handler(int proto)
@ -85,8 +73,8 @@ static inline void inet_diag_unlock_handler(
} }
static int inet_csk_diag_fill(struct sock *sk, static int inet_csk_diag_fill(struct sock *sk,
struct sk_buff *skb, struct sk_buff *skb, struct inet_diag_req *req,
int ext, u32 pid, u32 seq, u16 nlmsg_flags, u32 pid, u32 seq, u16 nlmsg_flags,
const struct nlmsghdr *unlh) const struct nlmsghdr *unlh)
{ {
const struct inet_sock *inet = inet_sk(sk); const struct inet_sock *inet = inet_sk(sk);
@ -97,8 +85,9 @@ static int inet_csk_diag_fill(struct sock *sk,
struct inet_diag_meminfo *minfo = NULL; struct inet_diag_meminfo *minfo = NULL;
unsigned char *b = skb_tail_pointer(skb); unsigned char *b = skb_tail_pointer(skb);
const struct inet_diag_handler *handler; const struct inet_diag_handler *handler;
int ext = req->idiag_ext;
handler = inet_diag_table[inet_diag_type2proto(unlh->nlmsg_type)]; handler = inet_diag_table[req->sdiag_protocol];
BUG_ON(handler == NULL); BUG_ON(handler == NULL);
nlh = NLMSG_PUT(skb, pid, seq, unlh->nlmsg_type, sizeof(*r)); nlh = NLMSG_PUT(skb, pid, seq, unlh->nlmsg_type, sizeof(*r));
@ -198,8 +187,8 @@ nlmsg_failure:
} }
static int inet_twsk_diag_fill(struct inet_timewait_sock *tw, static int inet_twsk_diag_fill(struct inet_timewait_sock *tw,
struct sk_buff *skb, int ext, u32 pid, struct sk_buff *skb, struct inet_diag_req *req,
u32 seq, u16 nlmsg_flags, u32 pid, u32 seq, u16 nlmsg_flags,
const struct nlmsghdr *unlh) const struct nlmsghdr *unlh)
{ {
long tmo; long tmo;
@ -250,14 +239,14 @@ nlmsg_failure:
} }
static int sk_diag_fill(struct sock *sk, struct sk_buff *skb, static int sk_diag_fill(struct sock *sk, struct sk_buff *skb,
int ext, u32 pid, u32 seq, u16 nlmsg_flags, struct inet_diag_req *r, u32 pid, u32 seq, u16 nlmsg_flags,
const struct nlmsghdr *unlh) const struct nlmsghdr *unlh)
{ {
if (sk->sk_state == TCP_TIME_WAIT) if (sk->sk_state == TCP_TIME_WAIT)
return inet_twsk_diag_fill((struct inet_timewait_sock *)sk, return inet_twsk_diag_fill((struct inet_timewait_sock *)sk,
skb, ext, pid, seq, nlmsg_flags, skb, r, pid, seq, nlmsg_flags,
unlh); unlh);
return inet_csk_diag_fill(sk, skb, ext, pid, seq, nlmsg_flags, unlh); return inet_csk_diag_fill(sk, skb, r, pid, seq, nlmsg_flags, unlh);
} }
static int inet_diag_get_exact(struct sk_buff *in_skb, static int inet_diag_get_exact(struct sk_buff *in_skb,
@ -317,7 +306,7 @@ static int inet_diag_get_exact(struct sk_buff *in_skb,
if (!rep) if (!rep)
goto out; goto out;
err = sk_diag_fill(sk, rep, req->idiag_ext, err = sk_diag_fill(sk, rep, req,
NETLINK_CB(in_skb).pid, NETLINK_CB(in_skb).pid,
nlh->nlmsg_seq, 0, nlh); nlh->nlmsg_seq, 0, nlh);
if (err < 0) { if (err < 0) {
@ -530,7 +519,7 @@ static int inet_csk_diag_dump(struct sock *sk,
return 0; return 0;
} }
return inet_csk_diag_fill(sk, skb, r->idiag_ext, return inet_csk_diag_fill(sk, skb, r,
NETLINK_CB(cb->skb).pid, NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq, NLM_F_MULTI, cb->nlh); cb->nlh->nlmsg_seq, NLM_F_MULTI, cb->nlh);
} }
@ -565,7 +554,7 @@ static int inet_twsk_diag_dump(struct inet_timewait_sock *tw,
return 0; return 0;
} }
return inet_twsk_diag_fill(tw, skb, r->idiag_ext, return inet_twsk_diag_fill(tw, skb, r,
NETLINK_CB(cb->skb).pid, NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq, NLM_F_MULTI, cb->nlh); cb->nlh->nlmsg_seq, NLM_F_MULTI, cb->nlh);
} }
@ -876,6 +865,18 @@ static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
return __inet_diag_dump(skb, cb, (struct inet_diag_req *)NLMSG_DATA(cb->nlh), bc); return __inet_diag_dump(skb, cb, (struct inet_diag_req *)NLMSG_DATA(cb->nlh), bc);
} }
static inline int inet_diag_type2proto(int type)
{
switch (type) {
case TCPDIAG_GETSOCK:
return IPPROTO_TCP;
case DCCPDIAG_GETSOCK:
return IPPROTO_DCCP;
default:
return 0;
}
}
static int inet_diag_dump_compat(struct sk_buff *skb, struct netlink_callback *cb) 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_compat *rc = NLMSG_DATA(cb->nlh);