staging:r8188eu: avoid skb_clone for amsdu to msdu conversion
PATCH 1/1 staging:r8188eu: avoid skb_clone for amsdu to msdu conversion
skb clones use same data buffer, so tail of one skb is corrupted by beginning of next skb.
--- drivers/staging/rtl8188eu/core/rtw_recv.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)
drivers/staging/rtl8188eu/core/rtw_recv.c +6 -13
@@ -1525,21 +1525,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 ) {
Signature · 1 line
2.24.1
Greg Kroah-Hartman
maintainerQuoted 1 line · Ivan Safonov
skb clones use same data buffer, so tail of one skb is corrupted by beginning of next skb.
Please properly wrap your changelog text at the correct column (72).
Also, your subject: line does not have the correct driver name :(
Quoted 25 lines
Signed-off-by Ivan Safonov <[email protected]>--- drivers/staging/rtl8188eu/core/rtw_recv.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)drivers/staging/rtl8188eu/core/rtw_recv.c +0
-11@@ -1525,21 +1525,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);
drivers/staging/rtl8188eu/core/rtw_recv.c static int amsdu_to_msdu(struct adapter *padapter, struct recv_frame *prframe) · line 1535
Quoted 10 lines
drivers/staging/rtl8188eu/core/rtw_recv.c +6
-2-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); +
Have you tested this?
thanks,
greg k-h
Quoted 6 lines · Greg Kroah-Hartman
Quoted 1 line · Ivan Safonov
skb clones use same data buffer, so tail of one skb is corrupted by beginning of next skb.
Please properly wrap your changelog text at the correct column (72).
Also, your subject: line does not have the correct driver name :(
Correct driver name is 'r8188eu':
1. http://driverdev.linuxdriverproject.org/pipermail/driverdev-devel/2016-June/090556.html :
Quoted 1 line
One other point, it is customary to start the patch subject with "staging: rtl8188eu: ..." for drivers in staging. I also prefer using r8188eu rather than rtl8188eu as the former is the actual name of the driver, but either will work.
2. ./drivers/staging/rtl8188eu/os_dep/usb_intf.c lines 483-522/522 (END):
Quoted 11 lines
static struct
usb_driverrtl8188e_usb_drv= {
.name = "r8188eu",
.probe =rtw_drv_init,
.disconnect =rtw_dev_remove,
.id_table =rtw_usb_id_tbl,
.suspend =rtw_suspend,
.resume =rtw_resume,
.reset_resume =rtw_resume,
};
module_usb_driver(rtl8188e_usb_drv)
Subject contain this name.
Quoted 32 lines
Quoted 32 lines
Signed-off-by Ivan Safonov <[email protected]>--- drivers/staging/rtl8188eu/core/rtw_recv.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)drivers/staging/rtl8188eu/core/rtw_recv.c +3
-13@@ -1525,21 +1525,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 ; }
Quoted 5 lines
drivers/staging/rtl8188eu/core/rtw_recv.c static int amsdu_to_msdu(struct adapter *padapter, struct recv_frame *prframe) · line 1535
Quoted 3 lines
drivers/staging/rtl8188eu/core/rtw_recv.c +3
-0+skb_reserve (sub_skb,12 ); +skb_put_data (sub_skb, pdata, nSubframe_Length); +Have you tested this?
I have not test this change.
Ivan Safonov.