From: Fabio Aiuto <fabioaiuto83@gmail.com>
To: gregkh@linuxfoundation.org
Cc: dan.carpenter@oracle.com, joe@perches.com,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Fabio Aiuto <fabioaiuto83@gmail.com>
Subject: [PATCH v3 03/30] staging: rtl8723bs: remove RT_TRACE logs in core/rtw_security.c
Date: Sat, 3 Apr 2021 11:13:25 +0200 [thread overview]
Message-ID: <14207c2b7ea789e8b0f3bd37d2758e979eff997c.1617440834.git.fabioaiuto83@gmail.com> (raw)
In-Reply-To: <cover.1617440833.git.fabioaiuto83@gmail.com>
Remove all of the RT_TRACE logs in the core/rtw_security.c file as they
currently do nothing as they require the code to be modified by
hand in order to be turned on. This obviously has not happened
since the code was merged. Moreover it relies on an unneeded
private log level tracing which overrides the in-kernel public one,
so just remove them as they are unused.
Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_security.c | 40 +------------------
1 file changed, 1 insertion(+), 39 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_security.c b/drivers/staging/rtl8723bs/core/rtw_security.c
index 8a447e149438..689419a76d94 100644
--- a/drivers/staging/rtl8723bs/core/rtw_security.c
+++ b/drivers/staging/rtl8723bs/core/rtw_security.c
@@ -236,16 +236,6 @@ void rtw_wep_decrypt(struct adapter *padapter, u8 *precvframe)
/* calculate icv and compare the icv */
*((u32 *)crc) = le32_to_cpu(getcrc32(payload, length-4));
- if (crc[3] != payload[length-1] || crc[2] != payload[length-2] || crc[1] != payload[length-3] || crc[0] != payload[length-4]) {
- RT_TRACE(_module_rtl871x_security_c_,
- _drv_err_,
- ("%s:icv error crc[3](%x)!=payload[length-1](%x) || crc[2](%x)!=payload[length-2](%x) || crc[1](%x)!=payload[length-3](%x) || crc[0](%x)!=payload[length-4](%x)\n",
- __func__,
- crc[3], payload[length - 1],
- crc[2], payload[length - 2],
- crc[1], payload[length - 3],
- crc[0], payload[length - 4]));
- }
}
}
@@ -609,8 +599,6 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
if (pattrib->encrypt == _TKIP_) {
{
- RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("%s: stainfo!= NULL!!!\n", __func__));
-
if (IS_MCAST(pattrib->ra))
prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey;
else
@@ -631,7 +619,6 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
if ((curfragnum+1) == pattrib->nr_frags) { /* 4 the last fragment */
length = pattrib->last_txcmdsz-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len;
- RT_TRACE(_module_rtl871x_security_c_, _drv_info_, ("pattrib->iv_len =%x, pattrib->icv_len =%x\n", pattrib->iv_len, pattrib->icv_len));
*((__le32 *)crc) = getcrc32(payload, length);/* modified by Amy*/
arcfour_init(&mycontext, rc4key, 16);
@@ -739,18 +726,9 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe)
*((u32 *)crc) = le32_to_cpu(getcrc32(payload, length-4));
- if (crc[3] != payload[length-1] || crc[2] != payload[length-2] || crc[1] != payload[length-3] || crc[0] != payload[length-4]) {
- RT_TRACE(_module_rtl871x_security_c_,
- _drv_err_,
- ("rtw_wep_decrypt:icv error crc[3](%x)!=payload[length-1](%x) || crc[2](%x)!=payload[length-2](%x) || crc[1](%x)!=payload[length-3](%x) || crc[0](%x)!=payload[length-4](%x)\n",
- crc[3], payload[length - 1],
- crc[2], payload[length - 2],
- crc[1], payload[length - 3],
- crc[0], payload[length - 4]));
+ if (crc[3] != payload[length-1] || crc[2] != payload[length-2] || crc[1] != payload[length-3] || crc[0] != payload[length-4])
res = _FAIL;
- }
} else {
- RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("%s: stainfo == NULL!!!\n", __func__));
res = _FAIL;
}
}
@@ -1380,8 +1358,6 @@ u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)
/* 4 start to encrypt each fragment */
if (pattrib->encrypt == _AES_) {
- RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("%s: stainfo!= NULL!!!\n", __func__));
-
if (IS_MCAST(pattrib->ra))
prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey;
else
@@ -1611,13 +1587,6 @@ static signed int aes_decipher(u8 *key, uint hdrlen,
/* compare the mic */
for (i = 0; i < 8; i++) {
if (pframe[hdrlen+8+plen-8+i] != message[hdrlen+8+plen-8+i]) {
- RT_TRACE(_module_rtl871x_security_c_,
- _drv_err_,
- ("%s:mic check error mic[%d]: pframe(%x) != message(%x)\n",
- __func__,
- i,
- pframe[hdrlen + 8 + plen - 8 + i],
- message[hdrlen + 8 + plen - 8 + i]));
DBG_871X("%s:mic check error mic[%d]: pframe(%x) != message(%x)\n",
__func__,
i,
@@ -1649,10 +1618,6 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)
if (prxattrib->encrypt == _AES_) {
stainfo = rtw_get_stainfo(&padapter->stapriv, &prxattrib->ta[0]);
if (stainfo) {
- RT_TRACE(_module_rtl871x_security_c_,
- _drv_err_,
- ("%s: stainfo!= NULL!!!\n", __func__));
-
if (IS_MCAST(prxattrib->ra)) {
static unsigned long start;
static u32 no_gkey_bc_cnt;
@@ -1706,9 +1671,6 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)
res = aes_decipher(prwskey, prxattrib->hdrlen, pframe, length);
} else {
- RT_TRACE(_module_rtl871x_security_c_,
- _drv_err_,
- ("%s: stainfo == NULL!!!\n", __func__));
res = _FAIL;
}
}
--
2.20.1
next prev parent reply other threads:[~2021-04-03 9:14 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-03 9:13 [PATCH v3 00/30] staging: rtl8723bs: remove RT_TRACE logs in core/* Fabio Aiuto
2021-04-03 9:13 ` [PATCH v3 01/30] staging: rtl8723bs: remove RT_TRACE logs in core/rtw_xmit.c Fabio Aiuto
2021-04-03 9:13 ` [PATCH v3 02/30] staging: rtl8723bs: fix condition in if statement " Fabio Aiuto
2021-04-03 9:13 ` Fabio Aiuto [this message]
2021-04-03 9:13 ` [PATCH v3 04/30] staging: rtl8723bs: fix line exceed warning in core/rtw_security.c Fabio Aiuto
2021-04-03 9:13 ` [PATCH v3 05/30] staging: rtl8723bs: fix spaces around operator issues " Fabio Aiuto
2021-04-03 9:13 ` [PATCH v3 06/30] staging: rtl8723bs: remove all RT_TRACE logs in core/rtw_eeprom.c Fabio Aiuto
2021-04-03 9:13 ` [PATCH v3 07/30] staging: rtl8723bs: fix error prone if conditions " Fabio Aiuto
2021-04-03 9:13 ` [PATCH v3 08/30] staging: rtl8723bs: remove all RT_TRACE logs in core/rtw_pwrctrl.c Fabio Aiuto
2021-04-03 9:13 ` [PATCH v3 09/30] staging: rtl8723bs: fix logical continuation issue " Fabio Aiuto
2021-04-03 9:13 ` [PATCH v3 10/30] staging: rtl8723bs: remove unnecessary parentheses in if-condition " Fabio Aiuto
2021-04-03 9:13 ` [PATCH v3 11/30] staging: rtl8723bs: remove RT_TRACE logs in core/rtw_cmd.c Fabio Aiuto
2021-04-03 9:13 ` [PATCH v3 12/30] staging: rtl8723bs: fix null check conditions " Fabio Aiuto
2021-04-03 9:13 ` [PATCH v3 13/30] staging: rtl8723bs: remove unnecessary parentheses in if condition " Fabio Aiuto
2021-04-03 9:13 ` [PATCH v3 14/30] staging: rtl8723bs: remove commented RT_TRACE calls in core/rtw_mlme.c Fabio Aiuto
2021-04-03 9:13 ` [PATCH v3 15/30] staging: rtl8723bs: remove RT_TRACE logs " Fabio Aiuto
2021-04-03 9:13 ` [PATCH v3 16/30] staging: rtl8723bs: tidy up some error handling " Fabio Aiuto
2021-04-03 9:42 ` Fabio Aiuto
2021-04-03 9:50 ` Fabio Aiuto
2021-04-03 10:04 ` Dan Carpenter
2021-04-03 9:13 ` [PATCH v3 17/30] staging: rtl8723bs: remove RT_TRACE logs in core/rtw_mlme_ext.c Fabio Aiuto
2021-04-03 9:13 ` [PATCH v3 18/30] staging: rtl8723bs: remove commented RT_TRACE calls in core/rtw_recv.c Fabio Aiuto
2021-04-03 9:13 ` [PATCH v3 19/30] staging: rtl8723bs: remove RT_TRACE logs " Fabio Aiuto
2021-04-03 9:13 ` [PATCH v3 20/30] staging: rtl8723bs: added spaces around operator " Fabio Aiuto
2021-04-03 9:13 ` [PATCH v3 21/30] staging: rtl8723bs: split long line " Fabio Aiuto
2021-04-03 9:13 ` [PATCH v3 22/30] staging: rtl8723bs: remove unnecessary parentheses " Fabio Aiuto
2021-04-03 9:13 ` [PATCH v3 23/30] staging: rtl8723bs: fix comparison in if condition " Fabio Aiuto
2021-04-03 15:24 ` Joe Perches
2021-04-03 9:13 ` [PATCH v3 24/30] staging: rtl8723bs: remove commented RT_TRACE call in core/rtw_ioctl_set.c Fabio Aiuto
2021-04-03 9:13 ` [PATCH v3 25/30] staging: rtl8723bs: remove RT_TRACE logs " Fabio Aiuto
2021-04-03 9:13 ` [PATCH v3 26/30] staging: rtl8723bs: place constant on the right side of the test " Fabio Aiuto
2021-04-03 9:13 ` [PATCH v3 27/30] staging: rtl8723bs: remove all RT_TRACE logs in core/rtw_wlan_util.c Fabio Aiuto
2021-04-03 9:13 ` [PATCH v3 28/30] staging: rtl8723bs: remove RT_TRACE logs in core/rtw_sta_mgt.c Fabio Aiuto
2021-04-03 9:13 ` [PATCH v3 29/30] staging: rtl8723bs: remove RT_TRACE logs in core/rtw_ieee80211.c Fabio Aiuto
2021-04-03 9:13 ` [PATCH v3 30/30] staging: rtl8723bs: add spaces around operators " Fabio Aiuto
2021-04-03 15:02 ` [PATCH v3 00/30] staging: rtl8723bs: remove RT_TRACE logs in core/* Joe Perches
2021-04-03 15:21 ` Fabio Aiuto
2021-04-03 16:17 ` Joe Perches
2021-04-03 17:28 ` Fabio Aiuto
2021-04-03 20:02 ` Joe Perches
2021-04-04 6:48 ` Fabio Aiuto
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=14207c2b7ea789e8b0f3bd37d2758e979eff997c.1617440834.git.fabioaiuto83@gmail.com \
--to=fabioaiuto83@gmail.com \
--cc=dan.carpenter@oracle.com \
--cc=gregkh@linuxfoundation.org \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
/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