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 0175/1039] ath11k: Use host CE parameters for CE interrupts configuration
    Date
    From: Anilkumar Kolli <akolli@codeaurora.org>

    [ Upstream commit b689f091aafd1a874b2f88137934276ab0fca480 ]

    CE interrupt configuration uses host ce parameters to assign/free
    interrupts. Use host ce parameters to enable/disable interrupts.
    This patch fixes below BUG,

    BUG: KASAN: global-out-of-bounds in 0xffffffbffdfb035c at addr
    ffffffbffde6eeac
    Read of size 4 by task kworker/u8:2/132
    Address belongs to variable ath11k_core_qmi_firmware_ready+0x1b0/0x5bc [ath11k]

    OOB is due to ath11k_ahb_ce_irqs_enable() iterates ce_count(which is 12)
    times and accessing 12th element in target_ce_config
    (which has only 11 elements) from ath11k_ahb_ce_irq_enable().

    With this change host ce configs are used to enable/disable interrupts.

    Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.5.0.1-00471-QCAHKSWPL_SILICONZ-1

    Fixes: 967c1d1131fa ("ath11k: move target ce configs to hw_params")
    Signed-off-by: Anilkumar Kolli <akolli@codeaurora.org>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Link: https://lore.kernel.org/r/1637249558-12793-1-git-send-email-akolli@codeaurora.org
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/ath/ath11k/ahb.c | 16 ++++++++--------
    1 file changed, 8 insertions(+), 8 deletions(-)

    diff --git a/drivers/net/wireless/ath/ath11k/ahb.c b/drivers/net/wireless/ath/ath11k/ahb.c
    index 8c9c781afc3e5..096c502cce387 100644
    --- a/drivers/net/wireless/ath/ath11k/ahb.c
    +++ b/drivers/net/wireless/ath/ath11k/ahb.c
    @@ -206,13 +206,13 @@ static void ath11k_ahb_clearbit32(struct ath11k_base *ab, u8 bit, u32 offset)

    static void ath11k_ahb_ce_irq_enable(struct ath11k_base *ab, u16 ce_id)
    {
    - const struct ce_pipe_config *ce_config;
    + const struct ce_attr *ce_attr;

    - ce_config = &ab->hw_params.target_ce_config[ce_id];
    - if (__le32_to_cpu(ce_config->pipedir) & PIPEDIR_OUT)
    + ce_attr = &ab->hw_params.host_ce_config[ce_id];
    + if (ce_attr->src_nentries)
    ath11k_ahb_setbit32(ab, ce_id, CE_HOST_IE_ADDRESS);

    - if (__le32_to_cpu(ce_config->pipedir) & PIPEDIR_IN) {
    + if (ce_attr->dest_nentries) {
    ath11k_ahb_setbit32(ab, ce_id, CE_HOST_IE_2_ADDRESS);
    ath11k_ahb_setbit32(ab, ce_id + CE_HOST_IE_3_SHIFT,
    CE_HOST_IE_3_ADDRESS);
    @@ -221,13 +221,13 @@ static void ath11k_ahb_ce_irq_enable(struct ath11k_base *ab, u16 ce_id)

    static void ath11k_ahb_ce_irq_disable(struct ath11k_base *ab, u16 ce_id)
    {
    - const struct ce_pipe_config *ce_config;
    + const struct ce_attr *ce_attr;

    - ce_config = &ab->hw_params.target_ce_config[ce_id];
    - if (__le32_to_cpu(ce_config->pipedir) & PIPEDIR_OUT)
    + ce_attr = &ab->hw_params.host_ce_config[ce_id];
    + if (ce_attr->src_nentries)
    ath11k_ahb_clearbit32(ab, ce_id, CE_HOST_IE_ADDRESS);

    - if (__le32_to_cpu(ce_config->pipedir) & PIPEDIR_IN) {
    + if (ce_attr->dest_nentries) {
    ath11k_ahb_clearbit32(ab, ce_id, CE_HOST_IE_2_ADDRESS);
    ath11k_ahb_clearbit32(ab, ce_id + CE_HOST_IE_3_SHIFT,
    CE_HOST_IE_3_ADDRESS);
    --
    2.34.1


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