Skip to content

Commit

Permalink
mac802154: tx: use put_unaligned_le16 for copy crc
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alexander Aring authored and Marcel Holtmann committed Oct 27, 2014
1 parent 0114123 commit 061ef8f
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions net/mac802154/tx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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))
Expand Down

0 comments on commit 061ef8f

Please sign in to comment.