mac802154: tx: use put_unaligned_le16 for copy crc
authorAlexander Aring <alex.aring@gmail.com>
Mon, 27 Oct 2014 16:13:28 +0000 (17:13 +0100)
committerMarcel Holtmann <marcel@holtmann.org>
Mon, 27 Oct 2014 17:07:36 +0000 (18:07 +0100)
This patch replaces the memcpy with a put_unaligned_le16. The placement
of crc inside of PSDU can also be unaligned. With memcpy this can fail
on some architectures.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Reported-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
net/mac802154/tx.c

index fe2e17e6fee3776d5b391389ca08e85e4ce12213..31e51e4635e453b9b74fd613a5f6694331597a17 100644 (file)
@@ -20,6 +20,7 @@
 #include <linux/netdevice.h>
 #include <linux/if_arp.h>
 #include <linux/crc-ccitt.h>
+#include <asm/unaligned.h>
 
 #include <net/rtnetlink.h>
 #include <net/ieee802154_netdev.h>
@@ -84,9 +85,9 @@ ieee802154_tx(struct ieee802154_local *local, struct sk_buff *skb)
        mac802154_monitors_rx(local, skb);
 
        if (!(local->hw.flags & IEEE802154_HW_OMIT_CKSUM)) {
-               __le16 crc = cpu_to_le16(crc_ccitt(0, skb->data, skb->len));
+               u16 crc = crc_ccitt(0, skb->data, skb->len);
 
-               memcpy(skb_put(skb, 2), &crc, 2);
+               put_unaligned_le16(crc, skb_put(skb, 2));
        }
 
        if (skb_cow_head(skb, local->hw.extra_tx_headroom))