2014-05-16 14:13:31

by Frederic Danis

Subject: [PATCH] ath10k: Fix ath10k_bmi_read32 macro

tmp may be used uninitialized if ath10k_bmi_read_memory() returns
an error.

Signed-off-by: Frederic Danis <[email protected]>
---
drivers/net/wireless/ath/ath10k/bmi.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath10k/bmi.h b/drivers/net/wireless/ath/ath10k/bmi.h
index 3a9bdf51..111ab70 100644
--- a/drivers/net/wireless/ath/ath10k/bmi.h
+++ b/drivers/net/wireless/ath/ath10k/bmi.h
@@ -201,7 +201,8 @@ int ath10k_bmi_write_memory(struct ath10k *ar, u32 address,
\
addr = host_interest_item_address(HI_ITEM(item)); \
ret = ath10k_bmi_read_memory(ar, addr, (u8 *)&tmp, 4); \
- *val = __le32_to_cpu(tmp); \
+ if (!ret) \
+ *val = __le32_to_cpu(tmp); \
ret; \
})

--
1.7.9.5

2014-05-23 08:31:18

by Kalle Valo

Subject: Re: [PATCH] ath10k: Fix ath10k_bmi_read32 macro

Frederic Danis <[email protected]> writes:

> tmp may be used uninitialized if ath10k_bmi_read_memory() returns
> an error.
>
> Signed-off-by: Frederic Danis <[email protected]>

Thanks, applied.

--
Kalle Valo