Commit a5809aff authored by Phil Turnbull's avatar Phil Turnbull Committed by Zheng Zengkai
Browse files

wifi: wilc1000: validate pairwise and authentication suite offsets 

stable inclusion
from stable-v5.10.156
commit 7c6535fb4d67ea37c98a1d1d24ca33dd5ec42693
category: bugfix
bugzilla: 188177, https://gitee.com/src-openeuler/kernel/issues/I66M3K
CVE: CVE-2022-47520

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=7c6535fb4d67ea37c98a1d1d24ca33dd5ec42693



--------------------------------

commit cd21d99e upstream.

There is no validation of 'offset' which can trigger an out-of-bounds
read when extracting RSN capabilities.

Signed-off-by: default avatarPhil Turnbull <philipturnbull@github.com>
Tested-by: default avatarAjay Kathat <ajay.kathat@microchip.com>
Acked-by: default avatarAjay Kathat <ajay.kathat@microchip.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20221123153543.8568-2-philipturnbull@github.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarDong Chenchen <dongchenchen2@huawei.com>
Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarXiu Jianfeng <xiujianfeng@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 88fa55ac

drivers/net/wireless/microchip/wilc1000/hif.c

+16 −5
Original line number Diff line number Diff line
@@ -467,15 +467,26 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss, 


	rsn_ie = cfg80211_find_ie(WLAN_EID_RSN, ies->data, ies->len);

	if (rsn_ie) {

		int rsn_ie_len = sizeof(struct element) + rsn_ie[1];

		int offset = 8;



		param->mode_802_11i = 2;

		param->rsn_found = true;

		/* extract RSN capabilities */

		if (offset < rsn_ie_len) {

			/* skip over pairwise suites */

			offset += (rsn_ie[offset] * 4) + 2;



			if (offset < rsn_ie_len) {

				/* skip over authentication suites */

				offset += (rsn_ie[offset] * 4) + 2;



				if (offset + 1 < rsn_ie_len) {

					param->mode_802_11i = 2;

					param->rsn_found = true;

					memcpy(param->rsn_cap, &rsn_ie[offset], 2);

				}

			}

		}

	}



	if (param->rsn_found) {

		int i;