Merge "wil6210: check null pointer in _wil_cfg80211_merge_extra_ies" (b6142300) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/net/wireless/ath/wil6210/cfg80211.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1871,7 +1871,7 @@ static int _wil_cfg80211_merge_extra_ies(const u8 *ies1, u16 ies1_len,
		memcpy(buf, ies1, ies1_len);
		dpos = buf + ies1_len;
		spos = ies2;
		while (spos + 1 < ies2 + ies2_len) {
		while (spos && (spos + 1 < ies2 + ies2_len)) {
		/* IE tag at offset 0, length at offset 1 */
		u16 ielen = 2 + spos[1];