diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2021-06-07 21:17:57 +0300 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-06-09 14:29:01 +0200 |
| commit | c47bcff9ae42c1cb24c828401f2681003b601564 (patch) | |
| tree | 8533cfc81ddc8bb8b89500e1139a4d2976881de9 /drivers/staging/rtl8188eu/core | |
| parent | staging: rtl8188eu: use safe iterator in dequeue_xmitframes_to_sleeping_queue() (diff) | |
| download | linux-dev-c47bcff9ae42c1cb24c828401f2681003b601564.tar.xz linux-dev-c47bcff9ae42c1cb24c828401f2681003b601564.zip | |
staging: rtl8188eu: use safe iterator in wakeup_sta_to_xmit()
These two loops call list_del_init() on the list iterator so they need to
use the _safe() iterator to prevent a forever loop.
Fixes: 23017c8842d2 ("staging: rtl8188eu: Use list iterators and helpers")
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/YL5i1ZAAAB4vSWef@mwanda
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8188eu/core')
| -rw-r--r-- | drivers/staging/rtl8188eu/core/rtw_xmit.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c b/drivers/staging/rtl8188eu/core/rtw_xmit.c index f57e41f817ca..d5489811c5bc 100644 --- a/drivers/staging/rtl8188eu/core/rtw_xmit.c +++ b/drivers/staging/rtl8188eu/core/rtw_xmit.c @@ -1796,17 +1796,14 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta) { u8 update_mask = 0, wmmps_ac = 0; struct sta_info *psta_bmc; - struct list_head *xmitframe_plist, *xmitframe_phead; - struct xmit_frame *pxmitframe = NULL; + struct list_head *xmitframe_phead; + struct xmit_frame *pxmitframe, *n; struct sta_priv *pstapriv = &padapter->stapriv; spin_lock_bh(&psta->sleep_q.lock); xmitframe_phead = get_list_head(&psta->sleep_q); - list_for_each(xmitframe_plist, xmitframe_phead) { - pxmitframe = list_entry(xmitframe_plist, struct xmit_frame, - list); - + list_for_each_entry_safe(pxmitframe, n, xmitframe_phead, list) { list_del_init(&pxmitframe->list); switch (pxmitframe->attrib.priority) { @@ -1881,10 +1878,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta) spin_lock_bh(&psta_bmc->sleep_q.lock); xmitframe_phead = get_list_head(&psta_bmc->sleep_q); - list_for_each(xmitframe_plist, xmitframe_phead) { - pxmitframe = list_entry(xmitframe_plist, - struct xmit_frame, list); - + list_for_each_entry_safe(pxmitframe, n, xmitframe_phead, list) { list_del_init(&pxmitframe->list); psta_bmc->sleepq_len--; |