diff options
author | Thomas Graf <tgraf@suug.ch> | 2005-12-01 17:30:00 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-12-01 17:30:00 -0500 |
commit | ea86575eaf99a9262a969309d934318028dbfacb (patch) | |
tree | d2d0418160460265ba61defa81bfbd870dce813e /net/ipv4/fib_frontend.c | |
parent | 2a43c4af3fa2e701008d51c28365e26fccf9cbb0 (diff) |
[NETLINK]: Fix processing of fib_lookup netlink messages
The receive path for fib_lookup netlink messages is lacking sanity
checks for header and payload and is thus vulnerable to malformed
netlink messages causing illegal memory references.
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
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 882f88f6d13b..19b1b984d687 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) | |||
544 | struct sk_buff *skb = NULL; | 544 | struct sk_buff *skb = NULL; |
545 | struct nlmsghdr *nlh = NULL; | 545 | struct nlmsghdr *nlh = NULL; |
546 | struct fib_result_nl *frn; | 546 | struct fib_result_nl *frn; |
547 | int err; | ||
548 | u32 pid; | 547 | u32 pid; |
549 | struct fib_table *tb; | 548 | struct fib_table *tb; |
550 | 549 | ||
551 | skb = skb_recv_datagram(sk, 0, 0, &err); | 550 | skb = skb_dequeue(&sk->sk_receive_queue); |
552 | nlh = (struct nlmsghdr *)skb->data; | 551 | nlh = (struct nlmsghdr *)skb->data; |
552 | if (skb->len < NLMSG_SPACE(0) || skb->len < nlh->nlmsg_len || | ||
553 | nlh->nlmsg_len < NLMSG_LENGTH(sizeof(*frn))) { | ||
554 | kfree_skb(skb); | ||
555 | return; | ||
556 | } | ||
553 | 557 | ||
554 | frn = (struct fib_result_nl *) NLMSG_DATA(nlh); | 558 | frn = (struct fib_result_nl *) NLMSG_DATA(nlh); |
555 | tb = fib_get_table(frn->tb_id_in); | 559 | tb = fib_get_table(frn->tb_id_in); |