Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f096ce6d authored by Jussi Kivilinna's avatar Jussi Kivilinna Committed by John W. Linville
Browse files

rndis_wlan: use RNDIS_WLAN_NUM_KEYS for all key index checks 



Use new RNDIS_WLAN_NUM_KEYS for checks in add_wep_key() and add_wpa_key().

Signed-off-by: default avatarJussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f808e4ad

drivers/net/wireless/rndis_wlan.c

+5 −3
Original line number Diff line number Diff line
@@ -1387,13 +1387,15 @@ static int add_wep_key(struct usbnet *usbdev, const u8 *key, int key_len, 
	netdev_dbg(usbdev->net, "%s(idx: %d, len: %d)\n",

		   __func__, index, key_len);



	if ((key_len != 5 && key_len != 13) || index < 0 || index > 3)

	if (index < 0 || index >= RNDIS_WLAN_NUM_KEYS)

		return -EINVAL;



	if (key_len == 5)

		cipher = WLAN_CIPHER_SUITE_WEP40;

	else

	else if (key_len == 13)

		cipher = WLAN_CIPHER_SUITE_WEP104;

	else

		return -EINVAL;



	memset(&ndis_key, 0, sizeof(ndis_key));
@@ -1436,7 +1438,7 @@ static int add_wpa_key(struct usbnet *usbdev, const u8 *key, int key_len, 
	bool is_addr_ok;

	int ret;



	if (index < 0 || index >= 4) {

	if (index < 0 || index >= RNDIS_WLAN_NUM_KEYS) {

		netdev_dbg(usbdev->net, "%s(): index out of range (%i)\n",

			   __func__, index);

		return -EINVAL;