diff options
| author |   Andrei Otcheretianski <andrei.otcheretianski@intel.com> | 2022-01-30 11:52:58 +0200 |
|---|---|---|
| committer |   Luca Coelho <luciano.coelho@intel.com> | 2022-02-18 10:40:52 +0200 |
| commit | f1658dcb29f423fea394aaa974a8cf5d491c503c (patch) | |
| tree | 3044619e174f1b1dc7e30846750b984ce4b3a492 /drivers/net/wireless/intel/iwlwifi/pcie/rx.c | |
| parent | iwlwifi: mvm: use debug print instead of WARN_ON() (diff) | |
| download | linux-dev-f1658dcb29f423fea394aaa974a8cf5d491c503c.tar.xz linux-dev-f1658dcb29f423fea394aaa974a8cf5d491c503c.zip | |
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: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20220130115024.ea00b52c6f25.I8b79b14f1af8b6f2f579f97b397b9e005fe446b1@changeid
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/pcie/rx.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c index bda98c2eb0ad..e4016c97d5ab 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c @@ -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); |