[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: efbe8f81952fe469d38655744627d860879dcde8
WARNING: Author mismatch between patch and upstream commit: Backport author: Dmitry Antipovdmantipov@yandex.ru Commit author: Anjaneyulupagadala.yesu.anjaneyulu@intel.com
Status in newer kernel trees: 6.13.y | Branch not found 6.12.y | Present (exact SHA1) 6.6.y | Present (exact SHA1) 6.1.y | Not found 5.15.y | Not found 5.10.y | Not found
Note: The patch differs from the upstream commit: --- 1: efbe8f81952fe ! 1: 7963551783c9b wifi: iwlwifi: add a few rate index validity checks @@ Metadata ## Commit message ## wifi: iwlwifi: add a few rate index validity checks
+ commit efbe8f81952fe469d38655744627d860879dcde8 upstream. + Validate index before access iwl_rate_mcs to keep rate->index inside the valid boundaries. Use MCS_0_INDEX if index is less - than MCS_0_INDEX and MCS_9_INDEX if index is greater then + than MCS_0_INDEX and MCS_9_INDEX if index is greater than MCS_9_INDEX.
Signed-off-by: Anjaneyulu pagadala.yesu.anjaneyulu@intel.com Signed-off-by: Gregory Greenman gregory.greenman@intel.com Link: https://lore.kernel.org/r/20230614123447.79f16b3aef32.If1137f894775d6d07b78c... Signed-off-by: Johannes Berg johannes.berg@intel.com + Signed-off-by: Dmitry Antipov dmantipov@yandex.ru
## drivers/net/wireless/intel/iwlwifi/dvm/rs.c ## @@ /****************************************************************************** * * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved. -- * Copyright (C) 2019 - 2020, 2022 Intel Corporation -+ * Copyright (C) 2019 - 2020, 2022 - 2023 Intel Corporation - *****************************************************************************/ - #include <linux/kernel.h> - #include <linux/skbuff.h> +- * Copyright (C) 2019 - 2020 Intel Corporation ++ * Copyright (C) 2019 - 2020, 2023 Intel Corporation + * + * Contact Information: + * Intel Linux Wireless linuxwifi@intel.com @@ drivers/net/wireless/intel/iwlwifi/dvm/rs.c: static int iwl_hwrate_to_plcp_idx(u32 rate_n_flags) return idx; } @@ drivers/net/wireless/intel/iwlwifi/mvm/rs.c // SPDX-License-Identifier: GPL-2.0-only /****************************************************************************** * -- * Copyright(c) 2005 - 2014, 2018 - 2022 Intel Corporation. All rights reserved. -+ * Copyright(c) 2005 - 2014, 2018 - 2023 Intel Corporation. All rights reserved. +- * Copyright(c) 2005 - 2014, 2018 - 2020 Intel Corporation. All rights reserved. ++ * Copyright(c) 2005 - 2014, 2018 - 2020, 2023 Intel Corporation. ++ * All rights reserved. * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH * Copyright(c) 2016 - 2017 Intel Deutschland GmbH - *****************************************************************************/ + * @@ drivers/net/wireless/intel/iwlwifi/mvm/rs.c: static void rs_get_lower_rate_down_column(struct iwl_lq_sta *lq_sta,
rate->bw = RATE_MCS_CHAN_WIDTH_20; ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-5.10.y | Success | Success |