Re: [PATCH 4/7] staging: rtl8188eu: use safe iterator in wakeup_sta_to_xmit()

Guenter Roeck
2021-06-09T10:37:24Z

On Mon, Jun 07, 2021 at 09:17:57PM +0300, Dan Carpenter wrote:
> 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")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
> drivers/staging/rtl8188eu/core/rtw_xmit.c | 14 ++++----------
> 1 file 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--;
> --
> 2.30.2
>