From: Haowen Bai <baihaowen@meizu.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Haowen Bai <baihaowen@meizu.com>, <linux-staging@lists.linux.dev>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH V4] staging: rtl8192e: Fix signedness bug in rtllib_rx_assoc_resp()
Date: Fri, 15 Apr 2022 14:39:27 +0800 [thread overview]
Message-ID: <1650004767-27432-1-git-send-email-baihaowen@meizu.com> (raw)
In-Reply-To: <20220415062000.GP3293@kadam>
This commit message suggested by Dan Carpenter as below:
The rtllib_rx_assoc_resp() function has a signedness bug because it's
a declared as a u16 but it return -ENOMEM. When you look at it more
closely it returns a mix of error codes including 0xcafe, -ENOMEM, and
a->status which is WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG. This is a mess.
Clean it up to just return standard kernel error codes. We can print
out the a->status before returning a regular error code. The printks
in the caller need to be adjusted as well.
Signed-off-by: Haowen Bai <baihaowen@meizu.com>
---
V1->V2: reduce return random value; print its own error message.
V2->V3: change commit message; change s16 -> int.
V3->V4: add message suggested by in title. If you look up what a->status
is, it can only be WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG which is not worth
preserving really
drivers/staging/rtl8192e/rtllib_softmac.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index 82bf05eb1cbf..ac0d131c1248 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -1764,7 +1764,7 @@ static void rtllib_softmac_check_all_nets(struct rtllib_device *ieee)
spin_unlock_irqrestore(&ieee->lock, flags);
}
-static inline u16 auth_parse(struct net_device *dev, struct sk_buff *skb,
+static inline int auth_parse(struct net_device *dev, struct sk_buff *skb,
u8 **challenge, int *chlen)
{
struct rtllib_authentication *a;
@@ -1773,7 +1773,7 @@ static inline u16 auth_parse(struct net_device *dev, struct sk_buff *skb,
if (skb->len < (sizeof(struct rtllib_authentication) -
sizeof(struct rtllib_info_element))) {
netdev_dbg(dev, "invalid len in auth resp: %d\n", skb->len);
- return 0xcafe;
+ return -EINVAL;
}
*challenge = NULL;
a = (struct rtllib_authentication *) skb->data;
@@ -1787,7 +1787,13 @@ static inline u16 auth_parse(struct net_device *dev, struct sk_buff *skb,
return -ENOMEM;
}
}
- return le16_to_cpu(a->status);
+
+ if (a->status) {
+ netdev_info(ieee->dev, "auth_parse() failed");
+ return -EINVAL;
+ }
+
+ return 0;
}
static int auth_rq_parse(struct net_device *dev, struct sk_buff *skb, u8 *dest)
@@ -2282,7 +2288,7 @@ rtllib_rx_assoc_resp(struct rtllib_device *ieee, struct sk_buff *skb,
static void rtllib_rx_auth_resp(struct rtllib_device *ieee, struct sk_buff *skb)
{
- u16 errcode;
+ int errcode;
u8 *challenge;
int chlen = 0;
bool bSupportNmode = true, bHalfSupportNmode = false;
@@ -2292,8 +2298,8 @@ static void rtllib_rx_auth_resp(struct rtllib_device *ieee, struct sk_buff *skb)
if (errcode) {
ieee->softmac_stats.rx_auth_rs_err++;
netdev_info(ieee->dev,
- "Authentication response status code 0x%x",
- errcode);
+ "Authentication response status code %d",
+ le16_to_cpu(errcode));
rtllib_associate_abort(ieee);
return;
}
--
2.7.4
next prev parent reply other threads:[~2022-04-15 6:39 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-15 2:09 [PATCH V2] staging: rtl8192e: Fix signedness bug in rtllib_rx_assoc_resp() Haowen Bai
2022-04-15 5:22 ` Fabio M. De Francesco
2022-04-15 5:31 ` Dan Carpenter
2022-04-15 5:50 ` [PATCH V3] " Haowen Bai
2022-04-15 6:06 ` Fabio M. De Francesco
2022-04-15 6:10 ` Fabio M. De Francesco
2022-04-15 6:15 ` [PATCH V4] " Haowen Bai
2022-04-15 6:20 ` Dan Carpenter
2022-04-15 6:39 ` Haowen Bai [this message]
2022-04-15 6:58 ` Dan Carpenter
2022-04-15 7:21 ` Haowen Bai
2022-04-20 16:41 ` Greg Kroah-Hartman
2022-04-21 1:34 ` Haowen Bai
2022-04-21 8:09 ` kernel test robot
2022-04-21 8:21 ` [PATCH V5] " Haowen Bai
2022-04-21 16:22 ` Dan Carpenter
2022-04-18 1:48 ` [PATCH V4] " baihaowen
2022-04-15 6:18 ` [PATCH V3] " Dan Carpenter
2022-04-15 5:25 ` [PATCH V2] " Dan Carpenter
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=1650004767-27432-1-git-send-email-baihaowen@meizu.com \
--to=baihaowen@meizu.com \
--cc=gregkh@linuxfoundation.org \
--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;
as well as URLs for NNTP newsgroup(s).