xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wifi: airo: do not assign -1 to unsigned char

Browse Source 
[ Upstream commit e6cb8769452e8236b52134e5cb4a18b8f5986932 ]

With char becoming unsigned by default, and with `char` alone being
ambiguous and based on architecture, we get a warning when assigning the
unchecked output of hex_to_bin() to that unsigned char. Mark `key` as a
`u8`, which matches the struct's type, and then check each call to
hex_to_bin() before casting.

Cc: Kalle Valo <kvalo@kernel.org>
Cc: linux-wireless@vger.kernel.org
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20221024162843.535921-1-Jason@zx2c4.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jason A. Donenfeld
2022-10-24 18:28:43 +02:00
committed by Greg Kroah-Hartman
parent 8552e6048e
commit 8d39913158
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/wireless/cisco/airo.c
View File

@@ -5236,7 +5236,7 @@ static int get_wep_tx_idx(struct airo_info *ai)
return -1; return -1;
} }
static int set_wep_key(struct airo_info *ai, u16 index, const char *key, static int set_wep_key(struct airo_info *ai, u16 index, const u8 *key,
u16 keylen, int perm, int lock) u16 keylen, int perm, int lock)
{ {
static const unsigned char macaddr[ETH_ALEN] = { 0x01, 0, 0, 0, 0, 0 }; static const unsigned char macaddr[ETH_ALEN] = { 0x01, 0, 0, 0, 0, 0 };
@@ -5287,7 +5287,7 @@ static void proc_wepkey_on_close(struct inode *inode, struct file *file)
struct net_device *dev = PDE_DATA(inode); struct net_device *dev = PDE_DATA(inode);
struct airo_info *ai = dev->ml_priv; struct airo_info *ai = dev->ml_priv;
int i, rc; int i, rc;
char key[16]; u8 key[16];
u16 index = 0; u16 index = 0;
int j = 0; int j = 0;
@@ -5315,12 +5315,22 @@ static void proc_wepkey_on_close(struct inode *inode, struct file *file)
} }
for (i = 0; i < 16*3 && data->wbuffer[i+j]; i++) { for (i = 0; i < 16*3 && data->wbuffer[i+j]; i++) {
int val;
if (i % 3 == 2)
continue;
val = hex_to_bin(data->wbuffer[i+j]);
if (val < 0) {
airo_print_err(ai->dev->name, "WebKey passed invalid key hex");
return;
}
switch(i%3) { switch(i%3) {
case 0: case 0:
key[i/3] = hex_to_bin(data->wbuffer[i+j])<<4; key[i/3] = (u8)val << 4;
break; break;
case 1: case 1:
key[i/3] |= hex_to_bin(data->wbuffer[i+j]); key[i/3] |= (u8)val;
break; break;
} }
} }