From 668d8679ff82ffb288b2cfb3aebbda6944caee2b Mon Sep 17 00:00:00 2001 From: sumedh baikady Date: Mon, 19 Mar 2018 17:48:41 -0700 Subject: [PATCH] qcacmn: Fix minor pn_size init and index check 1. In hal reo setup initialize pn_size to avoid uninitialization in default case. 2. In hal validate shadow register function, fix the check for index as shadow_config array can take 0 to 35 as index values. Change-Id: I8b729dc70053e333ef659ba38fb0c2f66cd8b35a CRs-fixed: 2208799 --- hal/wifi3.0/hal_rx.c | 3 ++- hal/wifi3.0/hal_srng.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hal/wifi3.0/hal_rx.c b/hal/wifi3.0/hal_rx.c index 967601fc998a..44cac9ea9244 100644 --- a/hal/wifi3.0/hal_rx.c +++ b/hal/wifi3.0/hal_rx.c @@ -73,7 +73,8 @@ void hal_reo_qdesc_setup(void *hal_soc, int tid, uint32_t ba_window_size, uint32_t *reo_queue_desc = (uint32_t *)hw_qdesc_vaddr; uint32_t *reo_queue_ext_desc; uint32_t reg_val; - uint32_t pn_enable, pn_size; + uint32_t pn_enable; + uint32_t pn_size = 0; qdf_mem_zero(hw_qdesc_vaddr, sizeof(struct rx_reo_queue)); diff --git a/hal/wifi3.0/hal_srng.c b/hal/wifi3.0/hal_srng.c index 3f241cee8e9a..22efd036a784 100644 --- a/hal/wifi3.0/hal_srng.c +++ b/hal/wifi3.0/hal_srng.c @@ -680,7 +680,7 @@ static void hal_validate_shadow_register(struct hal_soc *hal, index = shadow_address - shadow_0_offset; - if (index > MAX_SHADOW_REGISTERS) { + if (index >= MAX_SHADOW_REGISTERS) { QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "%s: index %x out of bounds\n", __func__, index); goto error;