From: David S. Miller Date: Thu, 8 Jun 2017 14:50:18 +0000 (-0400) Subject: Revert "decnet: dn_rtmsg: Improve input length sanitization in dnrmg_receive_user_skb" X-Git-Tag: v4.12-rc6~32^2~50 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c164772dd32343ee19e276ce0137830557517834;p=platform%2Fkernel%2Flinux-exynos.git Revert "decnet: dn_rtmsg: Improve input length sanitization in dnrmg_receive_user_skb" This reverts commit 85eac2ba35a2dbfbdd5767c7447a4af07444a5b4. There is an updated version of this fix which we should use instead. Signed-off-by: David S. Miller --- diff --git a/net/decnet/netfilter/dn_rtmsg.c b/net/decnet/netfilter/dn_rtmsg.c index 26e020e..1ed81ac 100644 --- 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))