2022-02-25 14:55:34

by Jia-Ju Bai

Subject: [PATCH] brcmfmac: check the return value of devm_kzalloc() in brcmf_of_probe()

The function devm_kzalloc() in brcmf_of_probe() can fail, so its return
value should be checked.

Fixes: 29e354ebeeec ("brcmfmac: Transform compatible string for FW loading")
Reported-by: TOTE Robot <[email protected]>
Signed-off-by: Jia-Ju Bai <[email protected]>
---
drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
index 513c7e6421b2..535e8ddeab8d 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
@@ -80,6 +80,8 @@ void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,
/* get rid of '/' in the compatible string to be able to find the FW */
len = strlen(tmp) + 1;
board_type = devm_kzalloc(dev, len, GFP_KERNEL);
+ if (!board_type)
+ return;
strscpy(board_type, tmp, len);
for (i = 0; i < board_type[i]; i++) {
if (board_type[i] == '/')
--
2.17.1

2022-03-11 07:53:45

by Jia-Ju Bai

Subject: Re: [PATCH] brcmfmac: check the return value of devm_kzalloc() in brcmf_of_probe()

On 2022/3/11 0:09, Kalle Valo wrote:
> Jia-Ju Bai <[email protected]> wrote:
>
>> The function devm_kzalloc() in brcmf_of_probe() can fail, so its return
>> value should be checked.
>>
>> Fixes: 29e354ebeeec ("brcmfmac: Transform compatible string for FW loading")
>> Reported-by: TOTE Robot <[email protected]>
>> Signed-off-by: Jia-Ju Bai <[email protected]>
> You are not calling of_node_put() in the error path. And I don't think
> this even applies.
>
> Patch set to Changes Requested.
>

Hi Kalle,

Thanks for the reply :)
I will add of_node_put() and send a V2 patch.


Best wishes,
Jia-Ju Bai