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

nvi fixes #2254

Merged
merged 3 commits into from
Dec 3, 2024
Merged

nvi fixes #2254

merged 3 commits into from
Dec 3, 2024

Conversation

brooksdavis
Copy link
Member

Merge some fixes from upstream nvi via FreeBSD. This was the only bit of code in nvi that was changed to support CHERI and a the commit messages don't really do justice to how utterly bonkers the code was.

Fixes #2253

brooksdavis and others added 3 commits November 27, 2024 18:49
Replace a rather convoluted realignment algorithm with memmove().  In
addition to being hard to understand, the code would read beyond the end
of the input buffer in certain conditions (found on CheriBSD).

Sponsored by:	DARPA
Pull Request:	lichray/nvi2#122

(cherry picked from commit 56ef9c872bc5b086d73fed6317159e40be32d40e)
We should use alignof in the future.

Obtained from: lichray/nvi2@25c4d7d

(cherry picked from commit 06a98fefd3d3ff42b7e7832af6c0736b98f167ac)
The weird pointer manipulation we'd been patching was infact buggy and
produced out of bounds accesses.  We've merged a patch upstream to use
memmove instead.
@bsdjhb bsdjhb merged commit 3a21336 into dev Dec 3, 2024
29 checks passed
@bsdjhb bsdjhb deleted the nvi-fixes branch December 3, 2024 15:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants