OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9065bc3
)
Revert "decnet: dn_rtmsg: Improve input length sanitization in dnrmg_receive_user_skb"
author
David S. Miller
<davem@davemloft.net>
Thu, 8 Jun 2017 14:50:18 +0000
(10:50 -0400)
committer
David S. Miller
<davem@davemloft.net>
Thu, 8 Jun 2017 14:50:18 +0000
(10:50 -0400)
This reverts commit
85eac2ba35a2dbfbdd5767c7447a4af07444a5b4
.
There is an updated version of this fix which we should
use instead.
Signed-off-by: David S. Miller <davem@davemloft.net>
net/decnet/netfilter/dn_rtmsg.c
patch
|
blob
|
history
diff --git
a/net/decnet/netfilter/dn_rtmsg.c
b/net/decnet/netfilter/dn_rtmsg.c
index
26e020e
..
1ed81ac
100644
(file)
--- a/
net/decnet/netfilter/dn_rtmsg.c
+++ b/
net/decnet/netfilter/dn_rtmsg.c
@@
-102,9
+102,7
@@
static inline void dnrmg_receive_user_skb(struct sk_buff *skb)
{
struct nlmsghdr *nlh = nlmsg_hdr(skb);
- if (skb->len < sizeof(nlh->nlmsg_len) ||
- nlh->nlmsg_len < sizeof(*nlh) ||
- skb->len < nlh->nlmsg_len)
+ if (nlh->nlmsg_len < sizeof(*nlh) || skb->len < nlh->nlmsg_len)
return;
if (!netlink_capable(skb, CAP_NET_ADMIN))