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

Drop vaddr_t from and apply style(9) fixes to minimal caprevoke code #1768

Merged
merged 9 commits into from
Jul 26, 2023

Conversation

jrtc27
Copy link
Member

@jrtc27 jrtc27 commented Jul 24, 2023

No description provided.

Fixes:	ef7ce3f ("tls_malloc: quanantine based revocation")
… support

Fixes:	7d7ef9d ("libmalloc_simple: Add semi-passive revocation.")
…upport

Fixes:	c4fe35e ("caprevoke: introduce sys/cheri/revoke.h")
sys/cheri/revoke.h Outdated Show resolved Hide resolved
lib/libcheri_caprevoke/libcheri_caprevoke.c Outdated Show resolved Hide resolved
In particular, the mask calculations were overly-complicated. Rewriting
them slightly differently allows special cases to be removed and common
code to be shared.
These should be entirely the same for all supported architectures, so
make the former more obviously an alias for the latter.
@@ -62,12 +62,29 @@ static uint64_t caprev_shadow_nomap_last_word_mask(ptraddr_t base, size_t len);
* the fine-grained bitmap where the first word would be located.
*/

static size_t
caprev_shadow_nomap_granule(ptraddr_t addr)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Thanks, this is a nice cleanup.

@bsdjhb bsdjhb merged commit e248dfc into dev Jul 26, 2023
20 checks passed
@bsdjhb bsdjhb deleted the more-vaddr_t branch July 26, 2023 23:22
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