lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0142/1039] ath11k: clear the keys properly via DISABLE_KEY
    Date
    From: Karthikeyan Kathirvel <kathirve@codeaurora.org>

    [ Upstream commit 436a4e88659842a7cf634d7cc088c8f2cc94ebf5 ]

    DISABLE_KEY sets the key_len to 0, firmware will not delete the keys if
    key_len is 0. Changing from security mode to open mode will cause mcast
    to be still encrypted without vdev restart.

    Set the proper key_len for DISABLE_KEY cmd to clear the keys in
    firmware.

    Tested-on: IPQ6018 hw1.0 AHB WLAN.HK.2.5.0.1-01100-QCAHKSWPL_SILICONZ-1

    Fixes: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices")
    Reported-by: Sven Eckelmann <sven@narfation.org>
    Signed-off-by: Karthikeyan Kathirvel <kathirve@codeaurora.org>
    [sven@narfation.org: split into separate patches, clean up commit message]
    Signed-off-by: Sven Eckelmann <sven@narfation.org>

    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Link: https://lore.kernel.org/r/20211115100441.33771-1-sven@narfation.org
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/ath/ath11k/mac.c | 4 +---
    drivers/net/wireless/ath/ath11k/wmi.c | 3 ++-
    2 files changed, 3 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
    index 1cc55602787bb..cdee7545e876a 100644
    --- a/drivers/net/wireless/ath/ath11k/mac.c
    +++ b/drivers/net/wireless/ath/ath11k/mac.c
    @@ -3316,9 +3316,7 @@ static int ath11k_install_key(struct ath11k_vif *arvif,
    return 0;

    if (cmd == DISABLE_KEY) {
    - /* TODO: Check if FW expects value other than NONE for del */
    - /* arg.key_cipher = WMI_CIPHER_NONE; */
    - arg.key_len = 0;
    + arg.key_cipher = WMI_CIPHER_NONE;
    arg.key_data = NULL;
    goto install;
    }
    diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c
    index 04238c29419b5..621a63d6c8c6d 100644
    --- a/drivers/net/wireless/ath/ath11k/wmi.c
    +++ b/drivers/net/wireless/ath/ath11k/wmi.c
    @@ -1689,7 +1689,8 @@ int ath11k_wmi_vdev_install_key(struct ath11k *ar,
    tlv = (struct wmi_tlv *)(skb->data + sizeof(*cmd));
    tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_BYTE) |
    FIELD_PREP(WMI_TLV_LEN, key_len_aligned);
    - memcpy(tlv->value, (u8 *)arg->key_data, key_len_aligned);
    + if (arg->key_data)
    + memcpy(tlv->value, (u8 *)arg->key_data, key_len_aligned);

    ret = ath11k_wmi_cmd_send(wmi, skb, WMI_VDEV_INSTALL_KEY_CMDID);
    if (ret) {
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 22:54    [W:4.019 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site