diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-01 15:54:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-01 15:54:00 -0800 |
| commit | deda498710e190c7922c2634ed630ee64ce86c05 (patch) | |
| tree | 4de8700e84390a50915760ac0da89bd145fed5b7 /net/ipv4/fib_frontend.c | |
| parent | ca98f825ea05edb41346f12408caa30be8a287c6 (diff) | |
| parent | ea86575eaf99a9262a969309d934318028dbfacb (diff) | |
| download | kernel_samsung_smdk4412-deda498710e190c7922c2634ed630ee64ce86c05.zip kernel_samsung_smdk4412-deda498710e190c7922c2634ed630ee64ce86c05.tar.gz kernel_samsung_smdk4412-deda498710e190c7922c2634ed630ee64ce86c05.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4/fib_frontend.c')
| -rw-r--r-- | net/ipv4/fib_frontend.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index 882f88f..19b1b98 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c @@ -544,12 +544,16 @@ static void nl_fib_input(struct sock *sk, int len) struct sk_buff *skb = NULL; struct nlmsghdr *nlh = NULL; struct fib_result_nl *frn; - int err; u32 pid; struct fib_table *tb; - skb = skb_recv_datagram(sk, 0, 0, &err); + skb = skb_dequeue(&sk->sk_receive_queue); nlh = (struct nlmsghdr *)skb->data; + if (skb->len < NLMSG_SPACE(0) || skb->len < nlh->nlmsg_len || + nlh->nlmsg_len < NLMSG_LENGTH(sizeof(*frn))) { + kfree_skb(skb); + return; + } frn = (struct fib_result_nl *) NLMSG_DATA(nlh); tb = fib_get_table(frn->tb_id_in); |