From nobody Mon Apr 6 11:53:26 2026 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) (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 8F61D3CE48A for ; Thu, 19 Mar 2026 12:07:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773922076; cv=none; b=ZantVpVmFPdiF3wkJkgjqbV4MgPyDzcGrRb5VW1TkHUJHo+ZdgvZngFcNzh5boXcAlldw5Ux4gMOSFuOO22qDZoH4Qzxr5rKD/amvg2NoG/xzYX8lix/S2N88s5v+4OfLUCFizXODS7P79XPTx0poJeFx0AycyM5uNt2Ux05Poo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773922076; c=relaxed/simple; bh=2jiC7UjcKaAEoMULz1150dJ+3GOCh197ydbWBLekmTU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=N6uoo5b0lUhGMW/zG947pXs+/JXvUYDfKtbsofYkYgIft/pgRe4vVZFlfOttLdqEeSz7yD2SjaTveQO4l2EJl+FeGZ11VnKNR+or0LPA4rI47/Hn28FxDBW3wm3zLXsuXfmVguN2XjRvJ600PTb6YfZSL4w5egSnv3OfxjD31iA= 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=cJ8B+cy2; arc=none smtp.client-ip=209.85.210.176 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="cJ8B+cy2" Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-829ac8d56c5so572680b3a.3 for ; Thu, 19 Mar 2026 05:07:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773922074; x=1774526874; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0JIiiOT4nulxSv/7mffOUFW8n/eEwVTsIYtRNyKYXEI=; b=cJ8B+cy2Fm41LYS8nQvHefOz2vi++48fIy3II45WNidBYvAIUno5voDsfP5H+oe5Ac BLKrW471txC+abn3vKMfaoUjAEBilXoalmIydmunPrTN8IEZJRS/FqrnjgQmbkg6JJ3R UJMlkd+BnzFrdzFpXLSk6JnmD2nsatq/e/XaHbm/rgXaj5Y2jWK9qf5nlrht/EKMIx94 MAwYeWaw9Hj1XqLqz0btIQihgmDmucNar/1nDSybLGe39JTQy32SF+aTVsTwDg5RVCwY semVXjnV0uEVKGN/BigT+LLiAw3n8m8UACVNqza2/8VmAfpVfLTIhnlpboTWU5FUlrM6 /PxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773922074; x=1774526874; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=0JIiiOT4nulxSv/7mffOUFW8n/eEwVTsIYtRNyKYXEI=; b=A0f3shu8ZYOi1dmdSaF1GUvVdWNmYXj2JNe9bbK0v1D87NiWMxgxa3btNp5LpdCHI0 YbgmyyKEfSte6x+kqLw3RDNaz5d5yscQvIeB0dwgrIVrQV4mDfxKFYtiu1QLslq4u6J8 rzX286NeWNyksmBgJHbw5rkRpzVE0Zkzy0Z0rdCsfxXsfHzLeieOZRErX8cFgUoo5Tzj JOAc5jvn6yTeae3t0fZsAvHPfDprPv9rbW+ZaSc+rK3G4e4ZhYgxopDx+PvFko3eG480 tnfP/z8EMxi7wxP8GaT4khL0rNxRoQhg2lqzB5VtsJa7HD7O87ZPrQHIDWgfRTi3Gwwz 7g2g== X-Forwarded-Encrypted: i=1; AJvYcCWoqmQ4vm2xd30+iUVBK2nWxwtYEl3S2LD/eD8rXxJzKiDqhaafKKbfUq2YgYsxbb8TEZuIi8ZEoDSnDvM=@vger.kernel.org X-Gm-Message-State: AOJu0YwTs2GuZCDGtZ56Fkg3TSygd4ttuE7mIJ5MSx/r9gPWLgmhO2o8 8zmEEhzusdH5efUYmjwGZuILfM1TtZe1zGSCugfyjCU18LHNe6aNF5RK X-Gm-Gg: ATEYQzxzsVUJFfN/S235d4PT/l0jRPOK8IIHY0nLEtQxAIIOQAkFGhHayyTyfGjcaAA AC+eS2Oxu6xHrSrzVyUzsWSPl/lkeUopyCuDsm76PWQwufYyLTr+D4fO5vDzIYkWmEpzsrZx+pV yECga3PsX7vH9DzUnMQNrSAw/FBeEyxlz36doSrTVpmK2FnOjUTm3EOYPHQ7BFCmFaEn6hkWezo bNceo6ESrTn4Oex8LxA8uAqPP4/Eowwyi+yChhW4A75DPm57rfIpehw/YXGHxfVn64bdukWeaNJ 46T7QmHHWtFzlV+ddOWQX7fQ8MB5OkXICNfL4x7iAUjEf1cM1ROaLruJxYbbk4joZJKY6oEYkWV JJwD1tlrFV71uFgHzKS5p0z3dyh+ffnnxYBTRdRCz/8QCumoUxAektrLKnh4NN0bd+QsNmmy/2B 5DGTxdVouNkxaDLP9lNz0dCRGd3ZEBNHrlsW76UjDwZfcNKdBEoBPA7S7RlGTTnvHKW8ckYulYs D6hUNZ5iE7PXeofOPyOfEc+we+3ZcdPyVQ8Xw== X-Received: by 2002:a05:6a00:2985:b0:829:6f82:5953 with SMTP id d2e1a72fcca58-82a6ac7ac37mr6517229b3a.5.1773922073896; Thu, 19 Mar 2026 05:07:53 -0700 (PDT) Received: from starpt-K55VD.. (2001-b011-7803-1df1-b14e-6890-de2e-81d0.dynamic-ip6.hinet.net. [2001:b011:7803:1df1:b14e:6890:de2e:81d0]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82a6bee990dsm7108477b3a.52.2026.03.19.05.07.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2026 05:07:53 -0700 (PDT) From: Lin YuChen To: gregkh@linuxfoundation.org, dan.carpenter@linaro.org Cc: straube.linux@gmail.com, starpt.official@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/2] staging: rtl8723bs: use guard clause for AES check Date: Thu, 19 Mar 2026 20:07:36 +0800 Message-Id: <20260319120737.29692-2-starpt.official@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260319120737.29692-1-starpt.official@gmail.com> References: <20260319120737.29692-1-starpt.official@gmail.com> 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" Refactor the AES encryption check by using a guard clause to reduce the indentation level of the subsequent logic. Signed-off-by: Lin YuChen --- v3: Use "return _SUCCESS" instead of "goto exit". v2: This is a new patch split from the original v1. drivers/staging/rtl8723bs/core/rtw_security.c | 104 +++++++++--------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_security.c b/drivers/stagin= g/rtl8723bs/core/rtw_security.c index b489babe7432..3c89e911ac2d 100644 --- a/drivers/staging/rtl8723bs/core/rtw_security.c +++ b/drivers/staging/rtl8723bs/core/rtw_security.c @@ -1213,68 +1213,68 @@ 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 (!psecuritypriv->binstallGrpkey) { - res =3D _FAIL; - - if (start =3D=3D 0) - start =3D jiffies; + if (prxattrib->encrypt !=3D _AES_) + return _SUCCESS; + 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 (!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; + if (is_broadcast_mac_addr(prxattrib->ra)) + no_gkey_bc_cnt++; + else + no_gkey_mc_cnt++; + + 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); } - - goto exit; + start =3D jiffies; + no_gkey_bc_cnt =3D 0; + no_gkey_mc_cnt =3D 0; } =20 - 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; - - 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]; + goto exit; } =20 - length =3D ((union recv_frame *)precvframe)->u.hdr.len - prxattrib->hdr= len - prxattrib->iv_len; - - 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 + prwskey =3D psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey; + if (psecuritypriv->dot118021XGrpKeyid !=3D prxattrib->key_index) { + res =3D _FAIL; + goto exit; + } } else { - res =3D _FAIL; + prwskey =3D &stainfo->dot118021x_UncstKey.skey[0]; } + + length =3D ((union recv_frame *)precvframe)->u.hdr.len - prxattrib->hdrl= en - prxattrib->iv_len; + + res =3D aes_decipher(prwskey, prxattrib->hdrlen, pframe, length); + + } else { + res =3D _FAIL; } exit: return res; --=20 2.34.1