From nobody Mon Apr 6 17:25:11 2026 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (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 48136314B82 for ; Wed, 18 Mar 2026 21:52:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773870726; cv=none; b=sG0bRqNI/4NDkoWO2LiTHnK6IHtrlvBo4QDwMJOj73QqN7reQ50gfdSSg62Pe7tHgvENSWF86RJnfRy83XCClau4vHYnjdO9yj6j4vU9meUqAQCaNYpFqcsGxnE0MsnWPikS97GpsI8q2OtWZ+ez4qMtjX99YWfALB5qzGFuLvg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773870726; c=relaxed/simple; bh=r3DN1E2dIqIUqXiaHXgymhrBHrwFQAOoPlTGzRyv4zs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WV5l6KneRGkRzKWmC0gmzvvnZcF0aIpLIQDCaMDQ4yjhghd+TKtSsE3VzL3I4wCRZOaom3gaRWkR+boOECxLDf3uAngG7f/RnTYV/RvyztPWjBcwYGtgukL+kdarYBGW9evTJVjhKGusualHrDc8kjS7TZ3jmlTDers/8DEPJho= 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=fGyDzFcr; arc=none smtp.client-ip=209.85.214.173 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="fGyDzFcr" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2ad21f437eeso2564105ad.0 for ; Wed, 18 Mar 2026 14:52:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773870724; x=1774475524; 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=hSfYgSfFs/jzgOQWBqeBc0r8Z2DYgVmZ/FKdXERNoe0=; b=fGyDzFcr5Yd8pModIRBCn5P9gtDNnoEgDvbxA2CQORZJe883WJg25iiHx0QqNwUtdO Y+DKKopov5fPXhGoYb/oOmV/DepY2xP36uCs7g51IIRlPiLpIVtCNfqR1CjTju2ynxA6 IM/hI6Y6BP15MwqntYbDDMWQF5Fh7u7P4LW01N/4YWB/Y7/U4A47LWgn6F+As3osCqrF jhwacja6mPE6QKAF7POnVFaU/AfqAs/F90P76UQN5ct6OQZB7gDMhKKRfsooj9OWL08Q z0wS3xYyij5VJ4S7l/3hXCB4UkjRbyidt2FnW8jCgMV4Mp5UwMKwSgfdq20oui7APe8Q h89g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773870724; x=1774475524; 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=hSfYgSfFs/jzgOQWBqeBc0r8Z2DYgVmZ/FKdXERNoe0=; b=HuyD48/ZU+OOnKdIga94Gd5z3IL7DdMVYgFIGL5XezVv6nKKYCKrbJ6qr8ZiAKmn97 0Kw3KuMGqW9ON+v9LgNSKuvfZWugooHr5unh1bRqBz6Ksd461HxVNO7+43XRILSYXfjV SVAqjlo7G9q1MdegIE5fLrgAMoOpz2S5JDujKFLVtlXmRqsP/zAfwObv/2JWW5Pwu0zm j37hxjdAAhqGvkI2HvGdkgaIYzOBIYfuoMukrZwbQw+8HedIUlyb+ZyP6b4DkzvQhskC vC5Hm1Cyo8d88tGk2yLPMI2iz5lXIMxgpvKOh/ye9hJtmxBeYiQKqlbuPASfEaW7dHoM 1MIA== X-Forwarded-Encrypted: i=1; AJvYcCUy7vjbg0x/i5t8athQqCQVk339CJL/vZ3wHn2uSRwZZph1IOHMPwH48dtCnEMS+VOfAg+7mGP2xQtXch4=@vger.kernel.org X-Gm-Message-State: AOJu0YwC9U+htfgqsNxceCH3i9YqnSYoszWV+k8FjMVHDW98MRYjO+n9 LV6Oh/vh5+Y3duh/tYN13JwBd/OrIzcPDKfEqEOSqNwFLPcqLT6+A+LG X-Gm-Gg: ATEYQzwxL7EnBi+XRCxei9AWVKBPvw0AQ/PkIQQDF/rZLg6syvFSPFluONg1Tuv6Lbx Bwt0YQTVW/XhEpK1awTxv9Y23dTbipnkvqCe6n8Os5PyTWKA1wSxexFdhLaCHN+zn77+0O8IT/e HMMVJwU1UV8g95St7mszbjOGZnTiC2t6gsPMM6OOEcKQkQGA/qWqd5swkrjb5OcNx5ou30BXAWi Crcx3J9vk70I9tcHpShS/J546Wmr0twliYL68sIBLv7+ubuOOkiWq9AfAuBeqayrHMa+eTY1xul vz1dOIKjsfIW6qsReybogrgh/uygbAm/kF10QactLSEEIpnZ2PivvzhZjqBu4OysAZghSjxy8eV LcdvrjlbptABJbzSxEpN9Sw0NnhbE6WjI04M6oOIF8xThCZu5EvlB2DUnlHfRUwN7LFr8VqooBu 60tsBrGfGJqglgJh85diqAEzMpgH8ogOdUlAIwUE1ILBRsW+MxyQzrBnmCagbHBmWOwdzlZzg4d 0RkHqLYkUJ9qQTzMhkF77WTPr03Bwkd/pMXTQ== X-Received: by 2002:a17:903:1a08:b0:2b0:4cf1:cd4a with SMTP id d9443c01a7336-2b077216458mr7952675ad.24.1773870724474; Wed, 18 Mar 2026 14:52:04 -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 d9443c01a7336-2b06e5ef58asm36511925ad.47.2026.03.18.14.52.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 14:52:04 -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 v2 1/2] staging: rtl8723bs: use guard clause for AES check Date: Thu, 19 Mar 2026 05:51:23 +0800 Message-Id: <20260318215124.22612-2-starpt.official@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260318215124.22612-1-starpt.official@gmail.com> References: <2026031810-kitty-untamed-2812@gregkh> <20260318215124.22612-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 --- drivers/staging/rtl8723bs/core/rtw_security.c | 107 +++++++++--------- 1 file changed, 55 insertions(+), 52 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_security.c b/drivers/stagin= g/rtl8723bs/core/rtw_security.c index b489babe7432..971d913ec6b3 100644 --- a/drivers/staging/rtl8723bs/core/rtw_security.c +++ b/drivers/staging/rtl8723bs/core/rtw_security.c @@ -1213,68 +1213,71 @@ 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 (prxattrib->encrypt !=3D _AES_) + goto exit; + 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 (start =3D=3D 0) - start =3D jiffies; + if (start =3D=3D 0) + start =3D jiffies; =20 - 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); - } - 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; + goto exit; + } =20 - 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]; + 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]; + } =20 - length =3D ((union recv_frame *)precvframe)->u.hdr.len - prxattrib->hdr= len - prxattrib->iv_len; + length =3D ((union recv_frame *)precvframe)->u.hdr.len - + prxattrib->hdrlen - prxattrib->iv_len; =20 - res =3D aes_decipher(prwskey, prxattrib->hdrlen, pframe, length); + res =3D aes_decipher(prwskey, prxattrib->hdrlen, pframe, length); =20 - } else { - res =3D _FAIL; - } + } else { + res =3D _FAIL; } exit: return res; --=20 2.34.1