diff options
| author | Felix Fietkau | 2019-02-22 13:21:15 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-02-27 10:09:01 +0100 |
| commit | 6bab27b60c1a9bfcba7bc63825a936153db9187c (patch) | |
| tree | 57cab1f0db7b35f59936ddffd8ec10b3014504bb /net/mac80211 | |
| parent | drm/amd/display: Fix MST reboot/poweroff sequence (diff) | |
| download | kernel-qcow2-linux-6bab27b60c1a9bfcba7bc63825a936153db9187c.tar.gz kernel-qcow2-linux-6bab27b60c1a9bfcba7bc63825a936153db9187c.tar.xz kernel-qcow2-linux-6bab27b60c1a9bfcba7bc63825a936153db9187c.zip | |
mac80211: allocate tailroom for forwarded mesh packets
commit 51d0af222f6fa43134c6187ab4f374630f6e0d96 upstream.
Forwarded packets enter the tx path through ieee80211_add_pending_skb,
which skips the ieee80211_skb_resize call.
Fixes WARN_ON in ccmp_encrypt_skb and resulting packet loss.
Cc: stable@vger.kernel.org
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/rx.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 51ad330bf8e8..828348b2a504 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2598,6 +2598,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) struct ieee80211_sub_if_data *sdata = rx->sdata; struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; u16 ac, q, hdrlen; + int tailroom = 0; hdr = (struct ieee80211_hdr *) skb->data; hdrlen = ieee80211_hdrlen(hdr->frame_control); @@ -2684,8 +2685,12 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) if (!ifmsh->mshcfg.dot11MeshForwarding) goto out; + if (sdata->crypto_tx_tailroom_needed_cnt) + tailroom = IEEE80211_ENCRYPT_TAILROOM; + fwd_skb = skb_copy_expand(skb, local->tx_headroom + - sdata->encrypt_headroom, 0, GFP_ATOMIC); + sdata->encrypt_headroom, + tailroom, GFP_ATOMIC); if (!fwd_skb) goto out; |