staging: rtl8188eu: use safe iterator in wakeup_sta_to_xmit()
authorDan Carpenter <dan.carpenter@oracle.com>
Mon, 7 Jun 2021 18:17:57 +0000 (21:17 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 9 Jun 2021 12:29:01 +0000 (14:29 +0200)
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>
drivers/staging/rtl8188eu/core/rtw_xmit.c

index f57e41f..d548981 100644 (file)
@@ -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--;