Page MenuHomeFreeBSD
Differential D50420

capsicum: Statically initialize commonly used capability rights
ClosedPublic
Actions

Authored by markj on Mon, May 19, 4:31 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, May 20, 8:26 PM
Unknown Object (File)
Tue, May 20, 8:43 AM
Unknown Object (File)
Tue, May 20, 8:38 AM
Subscribers
emaste
imp
olce

Details

Reviewers
oshogbo
brooks
kib
olce
Commits
rG1f922483cc99: capsicum: Statically initialize commonly used capability rights
Summary

Rather than initializing all of these sets during boot, define a macro
which can do so at compile-time. This lets us get rid of the silly
sysinit and furthermore allows the sets to live in .rodata, where they
ought to be anyway.

The CAP_RIGHTS_INITIALIZER2 macro can create a set out of up to two
capsicum rights. This could be made more general, but we currently
don't have any use for a more abstract implementation, so just keep it
simple for now.

No functional change intended.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

markj created this revision.Mon, May 19, 4:31 PM
Herald added subscribers: olce, imp. · View Herald TranscriptMon, May 19, 4:31 PM
markj requested review of this revision.Mon, May 19, 4:31 PM
Harbormaster completed remote builds in B64294: Diff 155700.Mon, May 19, 4:31 PM
markj added a parent revision: D50419: file: Qualify pointers to capsicum rights as const.Mon, May 19, 4:31 PM
oshogbo added a comment.Mon, May 19, 4:56 PM

I like this change, but I will verify it tomorrow if its fine with you :)
As I need to wrap my head around this calculations.

olce accepted this revision.Mon, May 19, 7:34 PM
olce added inline comments.
sys/sys/capsicum.h
374–376

Simplification.

You might want to also move the enclosing CAPRIGHT() in CAP_RIGHTS_INITIALIZER2() (see other inline comment).

381–389

If CAPRIGHT() is removed from _CAP_RIGHTS_WORD_INITIALIZER().

This revision is now accepted and ready to land.Mon, May 19, 7:34 PM
kib accepted this revision.Mon, May 19, 10:57 PM
markj updated this revision to Diff 155716.Tue, May 20, 12:47 AM
markj marked 2 inline comments as done.

Simplify the initializer macro.

This revision now requires review to proceed.Tue, May 20, 12:47 AM
Harbormaster completed remote builds in B64302: Diff 155716.Tue, May 20, 12:47 AM
markj added inline comments.Tue, May 20, 12:47 AM
sys/sys/capsicum.h
374–376

Actually, these CAPRIGHT() uses aren't needed at all. r already contains the index bits.

olce accepted this revision.Tue, May 20, 9:40 AM
olce added inline comments.
sys/sys/capsicum.h
374–376

👍

This revision is now accepted and ready to land.Tue, May 20, 9:40 AM
olce added inline comments.Tue, May 20, 9:42 AM
sys/sys/capsicum.h
374–375

You can still remove the redundant (r) & though.

oshogbo accepted this revision.Tue, May 20, 12:27 PM

Thank you.

markj updated this revision to Diff 155749.Tue, May 20, 1:38 PM

Simplify further.

This revision now requires review to proceed.Tue, May 20, 1:38 PM
Harbormaster completed remote builds in B64317: Diff 155749.Tue, May 20, 1:38 PM
olce accepted this revision.Tue, May 20, 1:50 PM
This revision is now accepted and ready to land.Tue, May 20, 1:50 PM
emaste added a subscriber: emaste.Tue, May 20, 8:10 PM

IMO also worth noting cap_chflags_rights in the commit message

Closed by commit rG1f922483cc99: capsicum: Statically initialize commonly used capability rights (authored by markj). · Explain WhyTue, May 20, 8:26 PM
This revision was automatically updated to reflect the committed changes.
markj added a commit: rG1f922483cc99: capsicum: Statically initialize commonly used capability rights.

Revision Contents
Changeset List

PathSize
sys/
kern/
156 lines
sys/
92 lines
18 lines

Diff 155769

View Options

sys/kern/subr_capability.c

Loading...
View Options

sys/sys/caprights.h

Loading...
View Options

sys/sys/capsicum.h

Loading...