public inbox for linux-staging@lists.linux.dev
 help / color / mirror / Atom feed
From: Martin Kaiser <martin@kaiser.cx>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Larry Finger <Larry.Finger@lwfinger.net>,
	Phillip Potter <phil@philpotter.co.uk>,
	Michael Straube <straube.linux@gmail.com>,
	Pavel Skripkin <paskripkin@gmail.com>,
	linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
	Martin Kaiser <martin@kaiser.cx>
Subject: [PATCH 6/9] staging: r8188eu: exit for deauth from unknown station
Date: Sat, 15 Oct 2022 17:24:37 +0200	[thread overview]
Message-ID: <20221015152440.232281-7-martin@kaiser.cx> (raw)
In-Reply-To: <20221015152440.232281-1-martin@kaiser.cx>

If we receive a deauth message from an unknown station, we can drop this
message and exit immediately. Reorder the code to make this clearer, don't
wrap everything in an if statement.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
 drivers/staging/r8188eu/core/rtw_mlme_ext.c | 22 ++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 742976c38cd5..40df0f9982f4 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -1477,21 +1477,21 @@ unsigned int OnDeAuth(struct adapter *padapter, struct recv_frame *precv_frame)
 	if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
 		struct sta_info *psta;
 		struct sta_priv *pstapriv = &padapter->stapriv;
+		u8 updated = 0;
 
 		psta = rtw_get_stainfo(pstapriv, mgmt->sa);
-		if (psta) {
-			u8 updated = 0;
-
-			spin_lock_bh(&pstapriv->asoc_list_lock);
-			if (!list_empty(&psta->asoc_list)) {
-				list_del_init(&psta->asoc_list);
-				pstapriv->asoc_list_cnt--;
-				updated = ap_free_sta(padapter, psta, false, reason);
-			}
-			spin_unlock_bh(&pstapriv->asoc_list_lock);
+		if (!psta)
+			return _SUCCESS;
 
-			associated_clients_update(padapter, updated);
+		spin_lock_bh(&pstapriv->asoc_list_lock);
+		if (!list_empty(&psta->asoc_list)) {
+			list_del_init(&psta->asoc_list);
+			pstapriv->asoc_list_cnt--;
+			updated = ap_free_sta(padapter, psta, false, reason);
 		}
+		spin_unlock_bh(&pstapriv->asoc_list_lock);
+
+		associated_clients_update(padapter, updated);
 
 		return _SUCCESS;
 	} else {
-- 
2.30.2


  parent reply	other threads:[~2022-10-15 15:24 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-15 15:24 [PATCH 0/9] staging: r8188eu: clean up the OnDeAuth function Martin Kaiser
2022-10-15 15:24 ` [PATCH 1/9] staging: r8188eu: replace one GetAddr3Ptr call Martin Kaiser
2022-10-15 15:24 ` [PATCH 2/9] staging: r8188eu: get reason code from mgmt struct Martin Kaiser
2022-10-15 15:24 ` [PATCH 3/9] staging: r8188eu: clarify the bBusyTraffic assignment Martin Kaiser
2022-10-15 15:24 ` [PATCH 4/9] staging: r8188eu: use sa instead of Addr2 Martin Kaiser
2022-10-15 15:24 ` [PATCH 5/9] staging: r8188eu: get bssid from mgmt struct Martin Kaiser
2022-10-15 15:24 ` Martin Kaiser [this message]
2022-10-15 15:24 ` [PATCH 7/9] staging: r8188eu: remove unnecessary return Martin Kaiser
2022-10-15 15:24 ` [PATCH 8/9] staging: r8188eu: summarize two flags checks Martin Kaiser
2022-10-15 15:24 ` [PATCH 9/9] staging: r8188eu: ignore_received_deauth is a boolean Martin Kaiser
2022-10-15 15:56 ` [PATCH 0/9] staging: r8188eu: clean up the OnDeAuth function Pavel Skripkin
2022-10-15 20:31 ` Philipp Hortmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221015152440.232281-7-martin@kaiser.cx \
    --to=martin@kaiser.cx \
    --cc=Larry.Finger@lwfinger.net \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-staging@lists.linux.dev \
    --cc=paskripkin@gmail.com \
    --cc=phil@philpotter.co.uk \
    --cc=straube.linux@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox