lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libertas: fix signedness bug in lbs_auth_to_authtype()

Browse Source 
Return type for lbs_auth_to_authtype() is changed from "u8" to
"int" to return negative error code correctly.
Also an error check is added in connect handler for invalid auth
type.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Kiran Divekar <dkiran@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Amitkumar Karwar
2012-03-28 11:38:01 -07:00
committed by John W. Linville
parent b4838d12e1
commit effcc625eb
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/wireless/libertas/cfg.c
View File

@@ -103,7 +103,7 @@ static const u32 cipher_suites[] = {
* Convert NL80211's auth_type to the one from Libertas, see chapter 5.9.1 * Convert NL80211's auth_type to the one from Libertas, see chapter 5.9.1
* in the firmware spec * in the firmware spec
*/ */
static u8 lbs_auth_to_authtype(enum nl80211_auth_type auth_type) static int lbs_auth_to_authtype(enum nl80211_auth_type auth_type)
{ {
int ret = -ENOTSUPP; int ret = -ENOTSUPP;
@@ -1411,7 +1411,12 @@ static int lbs_cfg_connect(struct wiphy *wiphy, struct net_device *dev,
goto done; goto done;
} }
lbs_set_authtype(priv, sme); ret = lbs_set_authtype(priv, sme);
if (ret == -ENOTSUPP) {
wiphy_err(wiphy, "unsupported authtype 0x%x\n", sme->auth_type);
goto done;
}
lbs_set_radio(priv, preamble, 1); lbs_set_radio(priv, preamble, 1);
/* Do the actual association */ /* Do the actual association */