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.

Sign up for GitHub

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

pf: Fix for purecap kernel with subobject bounds #2282

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from
+5 −4
Open

pf: Fix for purecap kernel with subobject bounds #2282

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8bc336f
pf: Disable CHERI subobject bounds in pf_addr
RoundofThree Dec 29, 2024
4d0013a
pf: Disable CHERI subobject bounds in pf_pdesc
RoundofThree Dec 29, 2024
f201118
pf: Add a padding to pfioc_qstats_v1 to have a different size to pfio…
RoundofThree Dec 29, 2024
29703da
pf: Avoid CHERI crashes due to an inocent OOB access of to-be-discard…
RoundofThree Dec 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions sys/net/pfvar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1918,6 +1918,7 @@ struct pfioc_qstats_v1 {
* written entirely in terms of the v0 or v1 type.
*/
u_int32_t version; /* Requested version of stats struct */
void *pad;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would not prefer this method of dealing with this issue. Just #ifdef out the v0 constant in the various switch statements instead for purecap.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Depending on how you do freebsd64 (or freebsd32) you may still need the native ABI to have unique ioctl numbers for these. Though it looks like there's no compat support for these currently. I know @kprovost discovered this encoding collision a while ago but don't recall what he thought the best fix was.

};

/* Latest version of struct pfioc_qstats_vX */
Expand Down