brcm80211: fmac: fix a couple checking after dereference bugs (d4ca0099) · Commits · 戴 / test

There were two dereferencing before checking for NULL static checker complaints in this new file. The list cursor is never NULL so that check can be removed. I moved the other dereference after the check. Signed-off-by:

Dan Carpenter <dan.carpenter@oracle.com> Acked-by:

Arend van Spriel <arend@broadcom.com> Signed-off-by:

John W. Linville <linville@tuxdriver.com>

drivers/net/wireless/brcm80211/brcmfmac/usb.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -482,7 +482,7 @@ static void brcmf_usb_free_q(struct list_head *q, bool pending)
		struct brcmf_usbreq req, next;
		int i = 0;
		list_for_each_entry_safe(req, next, q, list) {
		if (!req \|\| !req->urb) {
		if (!req->urb) {
		brcmf_dbg(ERROR, "bad req\n");
		break;
		}
		@@ -712,12 +712,12 @@ static int brcmf_usb_up(struct device *dev)
		struct brcmf_usbdev_info *devinfo = brcmf_usb_get_businfo(dev);
		u16 ifnum;

		if (devinfo->bus_pub.state == BCMFMAC_USB_STATE_UP)
		return 0;

		if (devinfo == NULL)
		return -EINVAL;

		if (devinfo->bus_pub.state == BCMFMAC_USB_STATE_UP)
		return 0;

		/* If the USB/HSIC bus in sleep state, wake it up */
		if (devinfo->suspend_state == USBOS_SUSPEND_STATE_SUSPENDED) {
		if (brcmf_usb_pnp(devinfo, BCMFMAC_USB_PNP_RESUME) != 0) {

Admin message