Commit 53985dcc authored Apr 17, 2016 by Per Forlin Committed by Kalle Valo Apr 26, 2016

brcmf: Fix null pointer exception in bcdc_hdrpull



In fwsignal.c: brcmf_fws_commit_skb()
...
if (rc < 0) {
  entry->transit_count--;
    if (entry->suppressed)
      entry->suppr_transit_count--;
      (void)brcmf_proto_hdrpull(fws->drvr, false, skb, NULL);
                                                     ^^^^^^^
    goto rollback;
}
...

The call to hdrpull will trigger a null pointer exception
unless a null check is made in the method implementation.

Signed-off-by: Per Forlin <per.forlin@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

parent 7705ba6f

drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -321,6 +321,7 @@ brcmf_proto_bcdc_hdrpull(struct brcmf_pub *drvr, bool do_fws,
		if (pktbuf->len == 0)
		return -ENODATA;

		if (ifp != NULL)
		*ifp = tmp_if;
		return 0;
		}