summaryrefslogtreecommitdiffstats
path: root/net/mac802154
diff options
context:
space:
mode:
authorAlexander Aring <aring@mojatatu.com>2018-07-02 16:32:03 -0400
committerStefan Schmidt <stefan@datenfreihafen.org>2018-08-06 11:21:37 +0200
commitf9c52831133050c6b82aa8b6831c92da2bbf2a0b (patch)
tree3adae5d528f6994088ab50de21e1e48d96e6669d /net/mac802154
parentac74f87c789af40936a80131c4759f3e72579c3a (diff)
downloadlinux-f9c52831133050c6b82aa8b6831c92da2bbf2a0b.tar.gz
linux-f9c52831133050c6b82aa8b6831c92da2bbf2a0b.tar.bz2
linux-f9c52831133050c6b82aa8b6831c92da2bbf2a0b.zip
net: mac802154: tx: expand tailroom if necessary
This patch is necessary if case of AF_PACKET or other socket interface which I am aware of it and didn't allocated the necessary room. Reported-by: David Palma <david.palma@ntnu.no> Reported-by: Rabi Narayan Sahoo <rabinarayans0828@gmail.com> Cc: stable@vger.kernel.org Signed-off-by: Alexander Aring <aring@mojatatu.com> Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
Diffstat (limited to 'net/mac802154')
-rw-r--r--net/mac802154/tx.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c
index 7e253455f9dd..bcd1a5e6ebf4 100644
--- a/net/mac802154/tx.c
+++ b/net/mac802154/tx.c
@@ -63,8 +63,21 @@ ieee802154_tx(struct ieee802154_local *local, struct sk_buff *skb)
int ret;
if (!(local->hw.flags & IEEE802154_HW_TX_OMIT_CKSUM)) {
- u16 crc = crc_ccitt(0, skb->data, skb->len);
+ struct sk_buff *nskb;
+ u16 crc;
+
+ if (unlikely(skb_tailroom(skb) < IEEE802154_FCS_LEN)) {
+ nskb = skb_copy_expand(skb, 0, IEEE802154_FCS_LEN,
+ GFP_ATOMIC);
+ if (likely(nskb)) {
+ consume_skb(skb);
+ skb = nskb;
+ } else {
+ goto err_tx;
+ }
+ }
+ crc = crc_ccitt(0, skb->data, skb->len);
put_unaligned_le16(crc, skb_put(skb, 2));
}