Commit a176e114 authored Apr 17, 2020 by Chris Rorvick Committed by Kalle Valo Apr 21, 2020

iwlwifi: actually check allocated conf_tlv pointer



Commit 71bc0334 ("iwlwifi: check allocated pointer when allocating
conf_tlvs") attempted to fix a typoe introduced by commit 17b809c9
("iwlwifi: dbg: move debug data to a struct") but does not implement the
check correctly.

Fixes: 71bc0334 ("iwlwifi: check allocated pointer when allocating conf_tlvs")
Tweeted-by: @grsecurity
Signed-off-by: Chris Rorvick <chris@rorvick.com>
Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200417074558.12316-1-sedat.dilek@gmail.com

parent 1f8fbe9c

drivers/net/wireless/intel/iwlwifi/iwl-drv.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1467,7 +1467,7 @@ static void iwl_req_fw_callback(const struct firmware ucode_raw, void context)
		kmemdup(pieces->dbg_conf_tlv[i],
		pieces->dbg_conf_tlv_len[i],
		GFP_KERNEL);
		if (!pieces->dbg_conf_tlv[i])
		if (!drv->fw.dbg.conf_tlv[i])
		goto out_free_fw;
		}
		}

Admin message