random-mirrors/amazingfate-rtl8723ds
1
0
Fork 0
mirror of https://github.com/amazingfate/rtl8723ds.git synced 2025-10-13 20:36:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

rtl8723ds: fix sta_info alignment

Browse Source 
Allocation function return memory that is properly aligned for most data
types, there is no need to manually align the buffer later.

On 64-bit systems this is particularly wrong as struct sta_info should
be 8-byte aligned so this calculation is guaranteed to misalign the
structure.  If the architecture requires aligned access, this leads to
an alignment fault and panic.

Signed-off-by: John Keeping <john@metanate.com>
This commit is contained in:
John Keeping 2022-11-29 18:30:16 +00:00
parent fa06cb893c
commit 255c827ec1
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/rtw_sta_mgt.c
View File

@ -222,13 +222,12 @@ u32 _rtw_init_sta_priv(struct sta_priv *pstapriv)
s32 i;
pstapriv->pallocated_stainfo_buf = rtw_zvmalloc(sizeof(struct sta_info) * NUM_STA + 4);
pstapriv->pallocated_stainfo_buf = rtw_zvmalloc(sizeof(struct sta_info) * NUM_STA);
if (!pstapriv->pallocated_stainfo_buf)
return _FAIL;
pstapriv->pstainfo_buf = pstapriv->pallocated_stainfo_buf + 4 -
((SIZE_PTR)(pstapriv->pallocated_stainfo_buf) & 3);
pstapriv->pstainfo_buf = pstapriv->pallocated_stainfo_buf;
_rtw_init_queue(&pstapriv->free_sta_queue);
@ -423,7 +422,7 @@ u32 _rtw_free_sta_priv(struct sta_priv *pstapriv)
#endif
if (pstapriv->pallocated_stainfo_buf)
rtw_vmfree(pstapriv->pallocated_stainfo_buf, sizeof(struct sta_info) * NUM_STA + 4);
rtw_vmfree(pstapriv->pallocated_stainfo_buf, sizeof(struct sta_info) * NUM_STA);
}
return _SUCCESS;