Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use correct size for VLAN tag load instruction #1430

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

dmiller-nmap
Copy link
Contributor

Not a true bug, since Linux kernel (net/core/filter.c) forces any load from SKF_AD_VLAN_TAG to a BPF_H width. However, this change makes libpcap code easier to understand.

Not a true bug, since Linux kernel (net/core/filter.c) forces any load
from SKF_AD_VLAN_TAG to a BPF_H width. However, this change makes
libpcap code easier to understand.
@infrastation
Copy link
Member

One CI worker failed due to timeouts on a busy host, another failed due to a macOS issue that should disappear after rebasing on the current master branch.

@dmiller-nmap
Copy link
Contributor Author

The only failed check appears to be a timeout: valid_wlan_subtype_qos_cf_poll_opt (alias 2): failed (filtertest timeout)

Any comments on this change?

@guyharris
Copy link
Member

Any comments on this change?

None on my part; as Denis noted, the timeout was just a timer that wasn't long enough for a busy (and, as I understand it, not all that fast) build host.

Denis, shall we merge this?

@infrastation
Copy link
Member

I had in mind to understand this a bit better because recently I came across two other cases of a load instruction size mismatching the packet field size (pppoes uses ld for a 16-bit session ID, dpc and hdpc use ld for a 14-bit point code). Let me try tomorrow.

Other than that, this will need a change log entry.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

4 participants