Commit f1658dcb authored by Andrei Otcheretianski's avatar Andrei Otcheretianski Committed by Luca Coelho
Browse files

iwlwifi: pcie: make sure iwl_rx_packet_payload_len() will not underflow 



If the device is malfunctioning and reports too short rx descriptor
length, iwl_rx_packet_payload_len() will underflow, eventually resulting
in accessing memory out of bounds and other bad things. Prevent this.

Signed-off-by: default avatarAndrei Otcheretianski <andrei.otcheretianski@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20220130115024.ea00b52c6f25.I8b79b14f1af8b6f2f579f97b397b9e005fe446b1@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 853450a6

drivers/net/wireless/intel/iwlwifi/pcie/rx.c

+1 −1
Original line number Diff line number Diff line
@@ -1317,7 +1317,7 @@ static void iwl_pcie_rx_handle_rb(struct iwl_trans *trans, 
		offset += ALIGN(len, FH_RSCSR_FRAME_ALIGN);



		/* check that what the device tells us made sense */

		if (offset > max_len)

		if (len < sizeof(*pkt) || offset > max_len)

			break;



		trace_iwlwifi_dev_rx(trans->dev, trans, pkt, len);