提交 cac4220b 编写于 作者: F Felix Fietkau 提交者: John W. Linville

ath9k: add compile time checking for the size of the channel list

This prevents random memory corruption if the number of channels ever gets
changed without an update to the internal channel array size.
Signed-off-by: NFelix Fietkau <nbd@openwrt.org>
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
上级 8610c29a
...@@ -61,6 +61,8 @@ ...@@ -61,6 +61,8 @@
#define ATH9K_RSSI_BAD -128 #define ATH9K_RSSI_BAD -128
#define ATH9K_NUM_CHANNELS 38
/* Register read/write primitives */ /* Register read/write primitives */
#define REG_WRITE(_ah, _reg, _val) \ #define REG_WRITE(_ah, _reg, _val) \
ath9k_hw_common(_ah)->ops->write((_ah), (_val), (_reg)) ath9k_hw_common(_ah)->ops->write((_ah), (_val), (_reg))
...@@ -618,7 +620,7 @@ struct ath_hw { ...@@ -618,7 +620,7 @@ struct ath_hw {
struct ath9k_hw_version hw_version; struct ath9k_hw_version hw_version;
struct ath9k_ops_config config; struct ath9k_ops_config config;
struct ath9k_hw_capabilities caps; struct ath9k_hw_capabilities caps;
struct ath9k_channel channels[38]; struct ath9k_channel channels[ATH9K_NUM_CHANNELS];
struct ath9k_channel *curchan; struct ath9k_channel *curchan;
union { union {
......
...@@ -481,6 +481,10 @@ static int ath9k_init_channels_rates(struct ath_softc *sc) ...@@ -481,6 +481,10 @@ static int ath9k_init_channels_rates(struct ath_softc *sc)
{ {
void *channels; void *channels;
BUILD_BUG_ON(ARRAY_SIZE(ath9k_2ghz_chantable) +
ARRAY_SIZE(ath9k_5ghz_chantable) !=
ATH9K_NUM_CHANNELS);
if (test_bit(ATH9K_MODE_11G, sc->sc_ah->caps.wireless_modes)) { if (test_bit(ATH9K_MODE_11G, sc->sc_ah->caps.wireless_modes)) {
channels = kmemdup(ath9k_2ghz_chantable, channels = kmemdup(ath9k_2ghz_chantable,
sizeof(ath9k_2ghz_chantable), GFP_KERNEL); sizeof(ath9k_2ghz_chantable), GFP_KERNEL);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册