staging:r8188eu: avoid skb_clone for amsdu to msdu conversion
authorIvan Safonov <insafonov@gmail.com>
Thu, 23 Apr 2020 19:14:04 +0000 (22:14 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 1 Oct 2020 11:12:42 +0000 (13:12 +0200)
[ Upstream commit 628cbd971a927abe6388d44320e351c337b331e4 ]

skb clones use same data buffer,
so tail of one skb is corrupted by beginning of next skb.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Link: https://lore.kernel.org/r/20200423191404.12028-1-insafonov@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/staging/rtl8188eu/core/rtw_recv.c

index afb9dadc1cfe9fdeda30e2dbdb466a60343a0468..77685bae21eda19bed3819980315cfb272bd9c1a 100644 (file)
@@ -1541,21 +1541,14 @@ static int amsdu_to_msdu(struct adapter *padapter, struct recv_frame *prframe)
 
                /* Allocate new skb for releasing to upper layer */
                sub_skb = dev_alloc_skb(nSubframe_Length + 12);
-               if (sub_skb) {
-                       skb_reserve(sub_skb, 12);
-                       skb_put_data(sub_skb, pdata, nSubframe_Length);
-               } else {
-                       sub_skb = skb_clone(prframe->pkt, GFP_ATOMIC);
-                       if (sub_skb) {
-                               sub_skb->data = pdata;
-                               sub_skb->len = nSubframe_Length;
-                               skb_set_tail_pointer(sub_skb, nSubframe_Length);
-                       } else {
-                               DBG_88E("skb_clone() Fail!!! , nr_subframes=%d\n", nr_subframes);
-                               break;
-                       }
+               if (!sub_skb) {
+                       DBG_88E("dev_alloc_skb() Fail!!! , nr_subframes=%d\n", nr_subframes);
+                       break;
                }
 
+               skb_reserve(sub_skb, 12);
+               skb_put_data(sub_skb, pdata, nSubframe_Length);
+
                subframes[nr_subframes++] = sub_skb;
 
                if (nr_subframes >= MAX_SUBFRAME_COUNT) {