Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[CONNECTOR]: clean up {,__}cn_rx_skb()

Browse source 
- __cn_rx_skb() does nothing but calls cn_call_callback(), it doesn't
check skb and msg sizes as the comment suggests, but cn_rx_skb() checks
those sizes.

- In cn_rx_skb() Local variable 'len' is not used. 'len' is probably
intended to be passed to skb_pull(), but here skb_pull() is not needed,
instead skb_free() is called.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Li Zefan 2008-01-04 01:55:01 -08:00 committed by David S. Miller
parent fd00eeccd9
commit 00f5e06c03
1 changed files with 4 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
drivers/connector/connector.c
View file

@ -181,34 +181,15 @@ static int cn_call_callback(struct cn_msg *msg, void (*destruct_data)(void *), v
return err; return err;
} }
/*
* Skb receive helper - checks skb and msg size and calls callback
* helper.
*/
static int __cn_rx_skb(struct sk_buff *skb, struct nlmsghdr *nlh)
{
u32 pid, uid, seq, group;
struct cn_msg *msg;
pid = NETLINK_CREDS(skb)->pid;
uid = NETLINK_CREDS(skb)->uid;
seq = nlh->nlmsg_seq;
group = NETLINK_CB((skb)).dst_group;
msg = NLMSG_DATA(nlh);
return cn_call_callback(msg, (void (*)(void *))kfree_skb, skb);
}
/* /*
* Main netlink receiving function. * Main netlink receiving function.
* *
* It checks skb and netlink header sizes and calls the skb receive * It checks skb, netlink header and msg sizes, and calls callback helper.
* helper with a shared skb.
*/ */
static void cn_rx_skb(struct sk_buff *__skb) static void cn_rx_skb(struct sk_buff *__skb)
{ {
struct cn_msg *msg;
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
u32 len;
int err; int err;
struct sk_buff *skb; struct sk_buff *skb;
@ -224,11 +205,8 @@ static void cn_rx_skb(struct sk_buff *__skb)
return; return;
} }
len = NLMSG_ALIGN(nlh->nlmsg_len); msg = NLMSG_DATA(nlh);
if (len > skb->len) err = cn_call_callback(msg, (void (*)(void *))kfree_skb, skb);
len = skb->len;
err = __cn_rx_skb(skb, nlh);
if (err < 0) if (err < 0)
kfree_skb(skb); kfree_skb(skb);
} }