aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Aring <aring@mojatatu.com>2018-04-20 15:15:05 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-04-29 11:33:13 +0200
commit4c2c574cf6ed0bbbddaac3d78061116230adea11 (patch)
tree184665b76a64fca8ff1334085805ac3ac9fbe572
parent388f3d9708fcc96cea44fe343ffe055e58ba6e6b (diff)
net: sched: ife: check on metadata length
[ Upstream commit d57493d6d1be26c8ac8516a4463bfe24956978eb ] This patch checks if sk buffer is available to dererence ife header. If not then NULL will returned to signal an malformed ife packet. This avoids to crashing the kernel from outside. Signed-off-by: Alexander Aring <aring@mojatatu.com> Reviewed-by: Yotam Gigi <yotam.gi@gmail.com> Acked-by: Jamal Hadi Salim <jhs@mojatatu.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--net/ife/ife.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ife/ife.c b/net/ife/ife.c
index 7fbe70a0af4b..13bbf8cb6a39 100644
--- a/net/ife/ife.c
+++ b/net/ife/ife.c
@@ -69,6 +69,9 @@ void *ife_decode(struct sk_buff *skb, u16 *metalen)
int total_pull;
u16 ifehdrln;
+ if (!pskb_may_pull(skb, skb->dev->hard_header_len + IFE_METAHDRLEN))
+ return NULL;
+
ifehdr = (struct ifeheadr *) (skb->data + skb->dev->hard_header_len);
ifehdrln = ntohs(ifehdr->metalen);
total_pull = skb->dev->hard_header_len + ifehdrln;