brcmfmac: Fix error pointer dereference
PATCH 1/1 brcmfmac: Fix error pointer dereference
The function brcmf_chip_add_core() can return an error pointer and is not checked. Add checks for error pointer.
Detected by Smatch:drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c:1010 brcmf_chip_recognition() error:
'core' dereferencing possible ERR_PTR()
drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c:1013 brcmf_chip_recognition() error:
'core' dereferencing possible ERR_PTR()
drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c:1016 brcmf_chip_recognition() error:
'core' dereferencing possible ERR_PTR()
drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c:1019 brcmf_chip_recognition() error:
'core' dereferencing possible ERR_PTR()
drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c:1022 brcmf_chip_recognition() error:
'core' dereferencing possible ERR_PTR()
--- .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c +15 -0
@@ -1007,18 +1007,33 @@ static int brcmf_chip_recognition(struct brcmf_chip_priv *ci) core =brcmf_chip_add_core (ci,BCMA_CORE_CHIPCOMMON ,SI_ENUM_BASE_DEFAULT ,0 ); +if (IS_ERR (core)) +return PTR_ERR (core); +brcmf_chip_sb_corerev (ci, core); core =brcmf_chip_add_core (ci,BCMA_CORE_SDIO_DEV ,BCM4329_CORE_BUS_BASE ,0 ); +if (IS_ERR (core)) +return PTR_ERR (core); +brcmf_chip_sb_corerev (ci, core); core =brcmf_chip_add_core (ci,BCMA_CORE_INTERNAL_MEM ,BCM4329_CORE_SOCRAM_BASE ,0 ); +if (IS_ERR (core)) +return PTR_ERR (core); +brcmf_chip_sb_corerev (ci, core); core =brcmf_chip_add_core (ci,BCMA_CORE_ARM_CM3 ,BCM4329_CORE_ARM_BASE ,0 ); +if (IS_ERR (core)) +return PTR_ERR (core); +brcmf_chip_sb_corerev (ci, core); core =brcmf_chip_add_core (ci,BCMA_CORE_80211 ,0x18001000 ,0 ); +if (IS_ERR (core)) +return PTR_ERR (core); +brcmf_chip_sb_corerev (ci, core); }else if (socitype ==SOCI_AI ) { ci->iscoreup = brcmf_chip_ai_iscoreup;
Signature · 1 line
2.53.0
Quoted 6 lines · Ethan Tidmore
The function
brcmf_chip_add_core()can return an error pointer and is not checked. Add checks for error pointer.Detected by Smatch:
drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c:1010brcmf_chip_recognition()error:
'core' dereferencing possibleERR_PTR()
[...]
Quoted 1 line
Fixes cb7cf7be9eba7 ("brcmfmac: make chip related functions host interface independent")
Quoted 4 lines
Signed-off-by Ethan Tidmore <[email protected]>--- .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)