summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2015-09-28 19:59:48 +0200
committerMarcel Holtmann <marcel@holtmann.org>2015-09-30 13:22:11 +0200
commit5f2ebb3b59c81a461ffd4921d12e9f6e09c32945 (patch)
tree0f5c026f7d0b0b476a2ae3cdba6643a1b8801098
parentb40988c438c2405a177ae54ff4baa08c720c296f (diff)
mac802154: check on len instead mac_len
This patch change the length check to len instead of mac_len for checking if the frame control field is available to dereference. We need to change it because I saw issues with af_packet raw sockets and the mrf24j40 which calls this functionality. The raw socket functionality doesn't set the mac_len but resets the skb_mac_header to skb->data which is still correct. The issue occur at mrf24j40 only, because the driver need to evaluate the fc fields. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--include/net/mac802154.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/mac802154.h b/include/net/mac802154.h
index 2c478501ad14..5718765cbd95 100644
--- a/include/net/mac802154.h
+++ b/include/net/mac802154.h
@@ -248,7 +248,7 @@ struct ieee802154_ops {
static inline __le16 ieee802154_get_fc_from_skb(const struct sk_buff *skb)
{
/* return some invalid fc on failure */
- if (unlikely(skb->mac_len < 2)) {
+ if (unlikely(skb->len < 2)) {
WARN_ON(1);
return cpu_to_le16(0);
}