wifi: ath11k: validate ath11k_crypto_mode on top of ath11k_core_qmi_firmware_ready
PATCH v3 1/1 wifi: ath11k: validate ath11k_crypto_mode on top of ath11k_core_qmi_firmware_ready
if ath11k_crypto_mode is invalid (not ATH11K_CRYPT_MODE_SW/ATH11K_CRYPT_MODE_HW), ath11k_core_qmi_firmware_ready() will not undo some actions that was previously started/configured. Do the validation as soon as possible in order to avoid undoing actions in that case and also to fix the following smatch warning:
drivers/net/wireless/ath/ath11k/core.c:2166 ath11k_core_qmi_firmware_ready()
warn: missing unwind goto?
---
Changelog:
v3: move validation to the beginning of the ath11k_core_qmi_firmware_ready(), so we do not need to clean-up things. A small change over the commit msg due that change.
v2: https://lore.kernel.org/linux-wireless/[email protected]/#t
v1: https://lore.kernel.org/linux-wireless/[email protected]/
--- drivers/net/wireless/ath/ath11k/core.c | 28 +++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-)
drivers/net/wireless/ath/ath11k/core.c +14 -14
@@ -2134,6 +2134,20 @@ int ath11k_core_qmi_firmware_ready(struct ath11k_base *ab) {int ret; +switch (ath11k_crypto_mode) { +case ATH11K_CRYPT_MODE_SW : +set_bit (ATH11K_FLAG_HW_CRYPTO_DISABLED , &ab->dev_flags); +set_bit (ATH11K_FLAG_RAW_MODE , &ab->dev_flags); +break ; +case ATH11K_CRYPT_MODE_HW : +clear_bit (ATH11K_FLAG_HW_CRYPTO_DISABLED , &ab->dev_flags); +clear_bit (ATH11K_FLAG_RAW_MODE , &ab->dev_flags); +break ; +default : +ath11k_info (ab,"invalid crypto_mode: %d\n" , ath11k_crypto_mode); +return -EINVAL ; + } + ret =ath11k_core_start_firmware (ab, ab->fw_mode);if (ret) {ath11k_err (ab,"failed to start firmware: %d\n" , ret);
@@ -2152,20 +2166,6 @@ int ath11k_core_qmi_firmware_ready(struct ath11k_base *ab) goto err_firmware_stop; } -switch (ath11k_crypto_mode) { -case ATH11K_CRYPT_MODE_SW : -set_bit (ATH11K_FLAG_HW_CRYPTO_DISABLED , &ab->dev_flags); -set_bit (ATH11K_FLAG_RAW_MODE , &ab->dev_flags); -break ; -case ATH11K_CRYPT_MODE_HW : -clear_bit (ATH11K_FLAG_HW_CRYPTO_DISABLED , &ab->dev_flags); -clear_bit (ATH11K_FLAG_RAW_MODE , &ab->dev_flags); -break ; -default : -ath11k_info (ab,"invalid crypto_mode: %d\n" , ath11k_crypto_mode); -return -EINVAL ; - } -if (ath11k_frame_mode ==ATH11K_HW_TXRX_RAW )set_bit (ATH11K_FLAG_RAW_MODE , &ab->dev_flags);
Signature · 1 line
2.49.0
Quoted 55 lines · Rodrigo Gobbi
if
ath11k_crypto_modeis invalid (not ATH11K_CRYPT_MODE_SW/ATH11K_CRYPT_MODE_HW),ath11k_core_qmi_firmware_ready()will not undo some actions that was previously started/configured. Do the validation as soon as possible in order to avoid undoing actions in that case and also to fix the following smatch warning:
drivers/net/wireless/ath/ath11k/core.c:2166ath11k_core_qmi_firmware_ready()
warn: missing unwind goto?Signed-off-by Rodrigo Gobbi <[email protected]>---
Changelog:
v3: move validation to the beginning of theath11k_core_qmi_firmware_ready(), so we do not need to clean-up things. A small change over the commit msg due that change.
v2: https://lore.kernel.org/linux-wireless/[email protected]/#t
v1: https://lore.kernel.org/linux-wireless/[email protected]/--- drivers/net/wireless/ath/ath11k/core.c | 28 +++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-)drivers/net/wireless/ath/ath11k/core.c +14
-7@@ -2134,6 +2134,20 @@ int ath11k_core_qmi_firmware_ready(struct ath11k_base *ab) {int ret; +switch (ath11k_crypto_mode) { +case ATH11K_CRYPT_MODE_SW : +set_bit (ATH11K_FLAG_HW_CRYPTO_DISABLED , &ab->dev_flags); +set_bit (ATH11K_FLAG_RAW_MODE , &ab->dev_flags); +break ; +case ATH11K_CRYPT_MODE_HW : +clear_bit (ATH11K_FLAG_HW_CRYPTO_DISABLED , &ab->dev_flags); +clear_bit (ATH11K_FLAG_RAW_MODE , &ab->dev_flags); +break ; +default : +ath11k_info (ab,"invalid crypto_mode: %d\n" , ath11k_crypto_mode); +return -EINVAL ; + } + ret =ath11k_core_start_firmware (ab, ab->fw_mode);if (ret) {ath11k_err (ab,"failed to start firmware: %d\n" , ret);@@ -2152,20 +2166,6 @@ int ath11k_core_qmi_firmware_ready(struct ath11k_base *ab) goto err_firmware_stop; } -switch (ath11k_crypto_mode) { -case ATH11K_CRYPT_MODE_SW : -set_bit (ATH11K_FLAG_HW_CRYPTO_DISABLED , &ab->dev_flags); -set_bit (ATH11K_FLAG_RAW_MODE , &ab->dev_flags); -break ; -case ATH11K_CRYPT_MODE_HW : -clear_bit (ATH11K_FLAG_HW_CRYPTO_DISABLED , &ab->dev_flags);
drivers/net/wireless/ath/ath11k/core.c int ath11k_core_qmi_firmware_ready(struct ath11k_base *ab) · line 2171
Quoted 10 lines
drivers/net/wireless/ath/ath11k/core.c +0
-7-clear_bit (ATH11K_FLAG_RAW_MODE , &ab->dev_flags); -break ; -default : -ath11k_info (ab,"invalid crypto_mode: %d\n" , ath11k_crypto_mode); -return -EINVAL ; - } -if (ath11k_frame_mode ==ATH11K_HW_TXRX_RAW )set_bit (ATH11K_FLAG_RAW_MODE , &ab->dev_flags);
Quoted 9 lines · Rodrigo Gobbi
if
ath11k_crypto_modeis invalid (not ATH11K_CRYPT_MODE_SW/ATH11K_CRYPT_MODE_HW),ath11k_core_qmi_firmware_ready()will not undo some actions that was previously started/configured. Do the validation as soon as possible in order to avoid undoing actions in that case and also to fix the following smatch warning:
drivers/net/wireless/ath/ath11k/core.c:2166ath11k_core_qmi_firmware_ready()
warn: missing unwind goto?Signed-off-by Rodrigo Gobbi <[email protected]>
Since this issue was previously reported, I'm adding:
Jeff Johnson
AppliedQuoted 9 lines · Rodrigo Gobbi
if
ath11k_crypto_modeis invalid (not ATH11K_CRYPT_MODE_SW/ATH11K_CRYPT_MODE_HW),ath11k_core_qmi_firmware_ready()will not undo some actions that was previously started/configured. Do the validation as soon as possible in order to avoid undoing actions in that case and also to fix the following smatch warning:
drivers/net/wireless/ath/ath11k/core.c:2166ath11k_core_qmi_firmware_ready()
warn: missing unwind goto?[...]
Applied, thanks!
[1/1] wifi: ath11k: validate ath11k_crypto_mode on top of ath11k_core_qmi_firmware_ready
commit: b0d226a60856a1b765bb9a3848c7b2322fd08c47
Best regards,
Signature · 1 line
Jeff Johnson <[email protected]>