diff options
| author | Alexander Aring <alex.aring@gmail.com> | 2014-10-27 17:13:28 +0100 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2014-10-27 18:07:36 +0100 |
| commit | 061ef8f915988839b12460c47ebfcf3700e124f0 (patch) | |
| tree | d0be975ce42d506ead60ad00e6b8a60bf2dcad64 /net/mac802154/tx.c | |
| parent | 01141234f237957ec962dda2f1ca89d9ef180884 (diff) | |
| download | linux-061ef8f915988839b12460c47ebfcf3700e124f0.tar.bz2 | |
mac802154: tx: use put_unaligned_le16 for copy crc
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>
Diffstat (limited to 'net/mac802154/tx.c')
| -rw-r--r-- | net/mac802154/tx.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c index fe2e17e6fee3..31e51e4635e4 100644 --- a/net/mac802154/tx.c +++ b/net/mac802154/tx.c @@ -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)) |