diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-05-31 12:02:43 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-05-31 12:02:43 +0800 |
| commit | a898540914d4136f29bc738ce593c1c501006f23 (patch) | |
| tree | 9440b7f76c029143611c89ed919718ba6ff353f4 /drivers/staging/rtl8188eu/core/rtw_recv.c | |
| parent | d97f745e1d2fea4d2f308e5e06eee81a9a84f3f5 (diff) | |
| parent | 56d847e3ef9433d7ac92376e4ba49d3cf3cb70d2 (diff) | |
Merge tag 'v4.1.40' into linux-linaro-lsk-v4.1lsk-v4.1-17.06lsk-v4.1-17.05linux-linaro-lsk-v4.1
This is the 4.1.40 stable release
Diffstat (limited to 'drivers/staging/rtl8188eu/core/rtw_recv.c')
| -rw-r--r-- | drivers/staging/rtl8188eu/core/rtw_recv.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/staging/rtl8188eu/core/rtw_recv.c b/drivers/staging/rtl8188eu/core/rtw_recv.c index cda725a8f9cd..7782b14ed5f7 100644 --- a/drivers/staging/rtl8188eu/core/rtw_recv.c +++ b/drivers/staging/rtl8188eu/core/rtw_recv.c @@ -1421,6 +1421,9 @@ static int wlanhdr_to_ethhdr(struct recv_frame *precvframe) ptr = recvframe_pull(precvframe, (rmv_len-sizeof(struct ethhdr) + (bsnaphdr ? 2 : 0))); } + if (!ptr) + return _FAIL; + memcpy(ptr, pattrib->dst, ETH_ALEN); memcpy(ptr+ETH_ALEN, pattrib->src, ETH_ALEN); |