From 10b4dbf4dfb54073226c8ef688ba3dddaaf37ff2 Mon Sep 17 00:00:00 2001 From: Oliver Hartkopp Date: Thu, 13 Aug 2009 22:54:25 +0000 Subject: [PATCH] --- yaml --- r: 159681 b: refs/heads/master c: 1758c0947605211ef953cc91d6bbdf847a21b822 h: refs/heads/master i: 159679: 2258e45ce3471e529486f86a038a4dffdb03680d v: v3 --- [refs] | 2 +- trunk/net/can/af_can.c | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 3e2790a2551d..72959bda5165 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49d4b8ba97034469b941d00d5ca1e3b897394e35 +refs/heads/master: 1758c0947605211ef953cc91d6bbdf847a21b822 diff --git a/trunk/net/can/af_can.c b/trunk/net/can/af_can.c index e733725b11d4..f9c027be78b2 100644 --- a/trunk/net/can/af_can.c +++ b/trunk/net/can/af_can.c @@ -651,12 +651,16 @@ static int can_rcv(struct sk_buff *skb, struct net_device *dev, struct can_frame *cf = (struct can_frame *)skb->data; int matches; - if (dev->type != ARPHRD_CAN || !net_eq(dev_net(dev), &init_net)) { - kfree_skb(skb); - return 0; - } + if (!net_eq(dev_net(dev), &init_net)) + goto drop; - BUG_ON(skb->len != sizeof(struct can_frame) || cf->can_dlc > 8); + if (WARN_ONCE(dev->type != ARPHRD_CAN || + skb->len != sizeof(struct can_frame) || + cf->can_dlc > 8, + "PF_CAN: dropped non conform skbuf: " + "dev type %d, len %d, can_dlc %d\n", + dev->type, skb->len, cf->can_dlc)) + goto drop; /* update statistics */ can_stats.rx_frames++; @@ -683,6 +687,10 @@ static int can_rcv(struct sk_buff *skb, struct net_device *dev, } return 0; + +drop: + kfree_skb(skb); + return 0; } /*