diff options
| author | Alexander Aring <alex.aring@gmail.com> | 2014-10-27 17:13:28 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2018-12-16 22:08:36 +0000 |
| commit | fbf6086661ae673a8f1b29b8e86438aa9a6f05de (patch) | |
| tree | 370c2f766b078a40e35b53c591fb7c2a3961039b /net/mac802154 | |
| parent | 6c9b4a9f64d772ae7df389e6b186afca382864c8 (diff) | |
| download | linux-stable-fbf6086661ae673a8f1b29b8e86438aa9a6f05de.tar.gz linux-stable-fbf6086661ae673a8f1b29b8e86438aa9a6f05de.tar.bz2 linux-stable-fbf6086661ae673a8f1b29b8e86438aa9a6f05de.zip | |
mac802154: tx: use put_unaligned_le16 for copy crc
commit 061ef8f915988839b12460c47ebfcf3700e124f0 upstream.
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>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/mac802154')
| -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 fede3a020219..430cae1f46d9 100644 --- a/net/mac802154/tx.c +++ b/net/mac802154/tx.c @@ -24,6 +24,7 @@ #include <linux/netdevice.h> #include <linux/if_arp.h> #include <linux/crc-ccitt.h> +#include <asm/unaligned.h> #include <net/ieee802154_netdev.h> #include <net/mac802154.h> @@ -95,9 +96,9 @@ netdev_tx_t mac802154_tx(struct mac802154_priv *priv, struct sk_buff *skb, mac802154_monitors_rx(mac802154_to_priv(&priv->hw), skb); if (!(priv->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, priv->hw.extra_tx_headroom)) |