Commit 137dabed authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

brcm80211: smac: remove smatch warnings from brcmsmac code 



The patch fixes following smatch warnings:

main.c +2902 brcms_b_read_objmem(11) info: ignoring unreachable code.
mac80211_if.c +1146 brcms_suspend(8) error: we previously assumed 'wl'
could be null (see line 1145)
srom.c +641 _initvars_srom_pci(16) error: potential null dereference
'entry'.  (kzalloc returns null)

Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarAlwin Beukers <alwin@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5e379203

drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c

+2 −2
Original line number Diff line number Diff line
@@ -1136,8 +1136,8 @@ static int brcms_suspend(struct bcma_device *pdev) 
	hw = bcma_get_drvdata(pdev);

	wl = hw->priv;

	if (!wl) {

		wiphy_err(wl->wiphy,

			  "brcms_suspend: bcma_get_drvdata failed\n");

		pr_err("%s: %s: no driver private struct!\n", KBUILD_MODNAME,

		       __func__);

		return -ENODEV;

	}

drivers/net/wireless/brcm80211/brcmsmac/main.c

+0 −1
Original line number Diff line number Diff line
@@ -2901,7 +2901,6 @@ brcms_b_read_objmem(struct brcms_hardware *wlc_hw, uint offset, u32 sel) 
		objoff += 2;



	return bcma_read16(core, objoff);

;

}



static void

drivers/net/wireless/brcm80211/brcmsmac/srom.c

+12 −2
Original line number Diff line number Diff line
@@ -621,7 +621,7 @@ static inline void cpu_to_le16_buf(u16 *buf, uint nwords) 
/*

 * convert binary srom data into linked list of srom variable items.

 */

static void

static int

_initvars_srom_pci(u8 sromrev, u16 *srom, struct list_head *var_list)

{

	struct brcms_srom_list_head *entry;
@@ -638,6 +638,9 @@ _initvars_srom_pci(u8 sromrev, u16 *srom, struct list_head *var_list) 


	/* first store the srom revision */

	entry = kzalloc(sizeof(struct brcms_srom_list_head), GFP_KERNEL);

	if (!entry)

		return -ENOMEM;



	entry->varid = BRCMS_SROM_REV;

	entry->var_type = BRCMS_SROM_UNUMBER;

	entry->uval = sromrev;
@@ -715,6 +718,8 @@ _initvars_srom_pci(u8 sromrev, u16 *srom, struct list_head *var_list) 


		entry = kzalloc(sizeof(struct brcms_srom_list_head) +

				extra_space, GFP_KERNEL);

		if (!entry)

			return -ENOMEM;

		entry->varid = id;

		entry->var_type = type;

		if (flags & SRFL_ETHADDR) {
@@ -754,6 +759,8 @@ _initvars_srom_pci(u8 sromrev, u16 *srom, struct list_head *var_list) 
			entry =

			    kzalloc(sizeof(struct brcms_srom_list_head),

				    GFP_KERNEL);

			if (!entry)

				return -ENOMEM;

			entry->varid = srv->varid+p;

			entry->var_type = BRCMS_SROM_UNUMBER;

			entry->uval = val;
@@ -761,6 +768,7 @@ _initvars_srom_pci(u8 sromrev, u16 *srom, struct list_head *var_list) 
		}

		pb += psz;

	}

	return 0;

}



/*
@@ -906,7 +914,9 @@ int srom_var_init(struct si_pub *sih) 
		INIT_LIST_HEAD(&sii->var_list);



		/* parse SROM into name=value pairs. */

		_initvars_srom_pci(sromrev, srom, &sii->var_list);

		err = _initvars_srom_pci(sromrev, srom, &sii->var_list);

		if (err)

			srom_free_vars(sih);

	}



errout:

CRA Git | Maintained and supported by SUSTech CRA and CCSE