From nobody Mon Apr 6 21:59:16 2026 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8897C3F54C4 for ; Tue, 17 Mar 2026 16:52:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773766332; cv=none; b=kNjCZmWdQzVaDJfe20WkAVy1KOgRzOx5JKq2CCnXRWKpVEcqxTjpZz+BAQ0Bd8PHLkszDolRWPZt3IE9whj9vBX8isoImWv37DRFLJY+LoLMwEjyny4LfdVBM8WDeYInqPXL5Y3s18i5CX2ymV3gfydmkzHBCse71raMmMNyOic= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773766332; c=relaxed/simple; bh=fRxiA25HBhWv1sjaEGJIbNYjRK88Lnr5cMVOhUhF3wA=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=BIVz/gVHjtQsDX91Nu3I3WuLwBpWi/c5JJOG00yDzq1S3Zq1nm8h7mnlNA7SMZz50tTz9kEd9l15dcl1nKQFa7ajqKB9x7KqmPr5+P3wrlDmefQszyJ3yuN4oHguP2BjvG/8Yl95pjhUydZWuDD1i1lh7FNZgB5Y6Q1ELbrf9pY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Wrhy2/ec; arc=none smtp.client-ip=209.85.210.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Wrhy2/ec" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-829928e512aso3136989b3a.2 for ; Tue, 17 Mar 2026 09:52:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773766330; x=1774371130; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=kovSUhP9uXrM0WSzENziXtNAdFAkMxJ9taYN2mKORio=; b=Wrhy2/ecVwAX4N+jDHhPrWsXj8T/c1+toFA/MFoLqgQFFgpc3N4+rW8MXBXgF8+V25 UTVPBX4dUnQCxnLPiBxjJAi5wvqfyJX36uCydwWpri1hh/uevbwoa9NdN4MFBIL3kASz qp9XIcpMgD2Pd9JXFby/nP63sOWsMBV2HPF4UM9wfdhR1rZVFlhyFmnAQR4zuoGJJHsf NJBJpzmUl3tNmm1uT//E1ClWqfzTzsPFq4qb3J8EO6Ssurf+pgnJQleNZ04DHsR5A5Pn fuh9iZau4DH/u6W9ngCZtXtCUG8AWm4Dfp4uvzkZDwdXd3Pu5LdtCyOazPIaku/pjnOV VeiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773766330; x=1774371130; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=kovSUhP9uXrM0WSzENziXtNAdFAkMxJ9taYN2mKORio=; b=DhRNJZVYnQBEQbABUmJLy7snZcJwELZVFMOoqUDpyQvZCAjhR7iS4fEoC0ruTUCzFQ yO9N1gaUP+dHO9eHvQTwCbyBdp7feveMVVK0QKLE8s1dEJreykRt+LujihqRWRGJgXHe I2s2T6od1DHXfKhVZaOoR9YL1vU+w/srkBilmjyf0KfO0Q0Gznql6LdsUIjHifQfuKs/ 3ihNciry11Arphde90kXkVZ+BY6QGfo7h4l9KSGmIHskMLa14Lt4DBZLNkHL4e+dUXSI VVWx1CN5BJITGi/DUl7iFTd1tr+VBuXmDXfpeyM7r6DD5bWj9Z0aA5kFR0IQMs4LlCms B1EQ== X-Forwarded-Encrypted: i=1; AJvYcCUeM31gZraIpUh03EiyK9MePsGAnTs92YaLYzDAFBu8iQA4Xs8q6+nZnBsX9zC4jk2ayncUm32DJnl9bv4=@vger.kernel.org X-Gm-Message-State: AOJu0Yz2HvV9FkrSY8cP7iZZ3NnyNem6vsGnhkm9VRMFlNH6oqINwYxX l+aAyI74te/0cZ2/tH49DVXVeMQsixre9QatOp/h9XQnSPWz9XPjsEJY X-Gm-Gg: ATEYQzzI2tMveRXT16uQ0fhMejuMZT8PoAJQihG3L2ZFiijjFN25aWcZwiGrjWwUtAX jxikEMssCo/aoAbPDyt/8Kr8gdZ+UMZC/LEkcX0D5ZATJEAT0voBnYr8BFVhYS/iEW3voCqZx+G dPOjGNSoFnYZeQpiyUOkPMJ8FGReyJJkYGo9Kf8PM2ffoK+tAuA+D2sK3cDOOK9CRyyZ2YKnwp8 5rXmAVSeex2OW75GuSH7J9EgcTFsixihbrN1jPLpL9U+P7vxY/cfF7B+FAF/FDaXT2avSLljlpO /+AXL1x4c2HooAGvqejW0dIWjA/9bZ73rhm5BGq2hsbtYGU0FZdp01DwdxeU8+NLkWSMtwsGIbO qceADxKEE0HIlET/cmc+OLQP1jy8O6TODucEv2vt/j7OQxbza+Lmwb0YTDe0+iRMNXOUnXl+ZhF 8rYVVN3lH3BPfGjhA0M3RwM5BCMKoXIqYonNqdEDe7WeogWG/B4zhXM1vl35+WJbU1SbXx173PF yb1Zs3hvSYvWlY1EVINLxyBZzZ2GfSOBSMvdA== X-Received: by 2002:a05:6a00:1992:b0:829:8aa3:2ebf with SMTP id d2e1a72fcca58-82a6ac3955dmr87946b3a.2.1773766329655; Tue, 17 Mar 2026 09:52:09 -0700 (PDT) Received: from starpt-K55VD.. (2001-b011-7803-1df1-d048-971a-a9b6-71d1.dynamic-ip6.hinet.net. [2001:b011:7803:1df1:d048:971a:a9b6:71d1]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82a073403a9sm17638823b3a.40.2026.03.17.09.52.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2026 09:52:08 -0700 (PDT) From: Lin YuChen To: gregkh@linuxfoundation.org Cc: dan.carpenter@linaro.org, straube.linux@gmail.com, starpt.official@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH] staging: rtl8723bs: refactor rtw_aes_decrypt() to reduce nesting Date: Wed, 18 Mar 2026 00:51:49 +0800 Message-Id: <20260317165149.16751-1-starpt.official@gmail.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Improve code readability by refactoring rtw_aes_decrypt() to use guard clauses and early exits. This reduces the maximum indentation level and flattens the logic flow for key assignment and decryption. Signed-off-by: Lin YuChen --- drivers/staging/rtl8723bs/core/rtw_security.c | 91 ++++++++++--------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_security.c b/drivers/stagin= g/rtl8723bs/core/rtw_security.c index b489babe7432..9229e0a1c792 100644 --- a/drivers/staging/rtl8723bs/core/rtw_security.c +++ b/drivers/staging/rtl8723bs/core/rtw_security.c @@ -1213,69 +1213,70 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *p= recvframe) =20 pframe =3D (unsigned char *)((union recv_frame *)precvframe)->u.hdr.rx_da= ta; /* 4 start to encrypt each fragment */ - if (prxattrib->encrypt =3D=3D _AES_) { - stainfo =3D rtw_get_stainfo(&padapter->stapriv, &prxattrib->ta[0]); - if (stainfo) { - if (is_multicast_ether_addr(prxattrib->ra)) { - static unsigned long start; - static u32 no_gkey_bc_cnt; - static u32 no_gkey_mc_cnt; + if (prxattrib->encrypt !=3D _AES_) + goto exit; =20 - if (!psecuritypriv->binstallGrpkey) { - res =3D _FAIL; + stainfo =3D rtw_get_stainfo(&padapter->stapriv, &prxattrib->ta[0]); + if (!stainfo) { + res =3D _FAIL; + goto exit; + } + if (is_multicast_ether_addr(prxattrib->ra)) { + static unsigned long start; + static u32 no_gkey_bc_cnt; + static u32 no_gkey_mc_cnt; =20 - if (start =3D=3D 0) - start =3D jiffies; + if (!psecuritypriv->binstallGrpkey) { + res =3D _FAIL; =20 - if (is_broadcast_mac_addr(prxattrib->ra)) - no_gkey_bc_cnt++; - else - no_gkey_mc_cnt++; + if (start =3D=3D 0) + start =3D jiffies; =20 - if (jiffies_to_msecs(jiffies - start) > 1000) { - if (no_gkey_bc_cnt || no_gkey_mc_cnt) { - netdev_dbg(padapter->pnetdev, - FUNC_ADPT_FMT " no_gkey_bc_cnt:%u, no_gkey_mc_cnt:%u\n", - FUNC_ADPT_ARG(padapter), - no_gkey_bc_cnt, - no_gkey_mc_cnt); - } - start =3D jiffies; - no_gkey_bc_cnt =3D 0; - no_gkey_mc_cnt =3D 0; - } - - goto exit; - } + if (is_broadcast_mac_addr(prxattrib->ra)) + no_gkey_bc_cnt++; + else + no_gkey_mc_cnt++; =20 + if (jiffies_to_msecs(jiffies - start) > 1000) { if (no_gkey_bc_cnt || no_gkey_mc_cnt) { netdev_dbg(padapter->pnetdev, - FUNC_ADPT_FMT " gkey installed. no_gkey_bc_cnt:%u, no_gkey_mc_cnt= :%u\n", - FUNC_ADPT_ARG(padapter), - no_gkey_bc_cnt, + FUNC_ADPT_FMT " no_gkey_bc_cnt:%u, no_gkey_mc_cnt:%u\n", + FUNC_ADPT_ARG(padapter), no_gkey_bc_cnt, no_gkey_mc_cnt); } - start =3D 0; + start =3D jiffies; no_gkey_bc_cnt =3D 0; no_gkey_mc_cnt =3D 0; - - prwskey =3D psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey; - if (psecuritypriv->dot118021XGrpKeyid !=3D prxattrib->key_index) { - res =3D _FAIL; - goto exit; - } - } else { - prwskey =3D &stainfo->dot118021x_UncstKey.skey[0]; } =20 - length =3D ((union recv_frame *)precvframe)->u.hdr.len - prxattrib->hdr= len - prxattrib->iv_len; + goto exit; + } =20 - res =3D aes_decipher(prwskey, prxattrib->hdrlen, pframe, length); + if (no_gkey_bc_cnt || no_gkey_mc_cnt) { + netdev_dbg(padapter->pnetdev, + FUNC_ADPT_FMT " gkey installed. no_gkey_bc_cnt:%u, no_gkey_mc_cnt:%= u\n", + FUNC_ADPT_ARG(padapter), no_gkey_bc_cnt, + no_gkey_mc_cnt); + } + start =3D 0; + no_gkey_bc_cnt =3D 0; + no_gkey_mc_cnt =3D 0; =20 - } else { + prwskey =3D psecuritypriv->dot118021XGrpKey[prxattrib->key_index] + .skey; + if (psecuritypriv->dot118021XGrpKeyid !=3D prxattrib->key_index) { res =3D _FAIL; + goto exit; } + } else { + prwskey =3D &stainfo->dot118021x_UncstKey.skey[0]; } + + length =3D ((union recv_frame *)precvframe)->u.hdr.len - + prxattrib->hdrlen - prxattrib->iv_len; + + res =3D aes_decipher(prwskey, prxattrib->hdrlen, pframe, length); + exit: return res; } --=20 2.34.1