OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'aosp/android-4.4' into kernel-4.4
[android-x86/kernel.git]
/
net
/
ipv4
/
fib_frontend.c
diff --git
a/net/ipv4/fib_frontend.c
b/net/ipv4/fib_frontend.c
index
7e30c7b
..
a353d1d
100644
(file)
--- a/
net/ipv4/fib_frontend.c
+++ b/
net/ipv4/fib_frontend.c
@@
-1081,7
+1081,8
@@
static void nl_fib_input(struct sk_buff *skb)
net = sock_net(skb->sk);
nlh = nlmsg_hdr(skb);
- if (skb->len < NLMSG_HDRLEN || skb->len < nlh->nlmsg_len ||
+ if (skb->len < nlmsg_total_size(sizeof(*frn)) ||
+ skb->len < nlh->nlmsg_len ||
nlmsg_len(nlh) < sizeof(*frn))
return;