The node pointer is guaranteed to be non-NULL by the net80211 stack.
The original check was also ineffective as it dereferenced ni->ni_vap before the NULL check.
Details
Details
- Reviewers
adrian bz - Group Reviewers
wireless - Commits
- rG9ef75e05ba91: wtap: Remove bogus NULL check in wtap_transmit
Diff Detail
Diff Detail
- Repository
- rG FreeBSD src repository
- Lint
Lint Not Applicable - Unit
Tests Not Applicable
Event Timeline
Comment Actions
Can you please create diffs with -U9999 if you manually upload them so there is context?
| sys/dev/wtap/if_wtap.c | ||
|---|---|---|
| 594 | The assumption that this can happen seems wrong. This should probably be a MPASS(ni != NULL); and we should be done with it. Ignoring this for a minute if you look at ieee80211_parent_xmitpkt() which calls ic->ic_transmit you'll see that in the error case it does the cleanup (which does depend on the ni being valid) so be careful if you already free the mbuf (likely wrong). This is different to (*ic_raw_xmit) where you'd need to free the mbuf. | |
| sys/dev/wtap/if_wtap.c | ||
|---|---|---|
| 594 | So, turns out the NULL check on the node ni is unnecessary in the first place. Let me revise the commit by removing the NULL check on the node ni. | |