diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-03-20 12:03:07 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-03-20 12:03:07 +0800 |
| commit | 1c563c0006661025d7a6c9bc85fc889a4e8a1c06 (patch) | |
| tree | 93d455583031d0cacebfd436d5b2118a536de5f7 /drivers/staging/rtl8188eu/core/rtw_recv.c | |
| parent | 71205f3b80da389c52cc2611f59e183a77c56f4f (diff) | |
| parent | 28ec98bc2e4a175b60f45d505e715a33b93dd077 (diff) | |
Merge tag 'v4.4.55' into linux-linaro-lsk-v4.4lsk-v4.4-17.03
This is the 4.4.55 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 110b8c0b6cd7..0f2fe34e14c2 100644 --- a/drivers/staging/rtl8188eu/core/rtw_recv.c +++ b/drivers/staging/rtl8188eu/core/rtw_recv.c @@ -1405,6 +1405,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); |