Move AccessFSSet validation to accessfs.go

landlock-lsm · Aug 28, 2021 · e80545a · e80545a
1 parent fd8c035
commit e80545a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/landlock/accessfs.go b/landlock/accessfs.go
@@ -58,3 +58,9 @@ func (a AccessFSSet) intersect(b AccessFSSet) AccessFSSet {
 func (a AccessFSSet) isEmpty() bool {
  return a == 0
 }
+
+// valid returns true iff the given AccessFSSet is supported by this
+// version of go-landlock.
+func (a AccessFSSet) valid() bool {
+ return a.isSubset(highestKnownABIVersion.supportedAccessFS)
+}
diff --git a/landlock/config.go b/landlock/config.go
@@ -48,8 +48,7 @@ type Config struct {
 // validate returns success when the given config is supported by
 // go-landlock. (It may still be unsupported by your kernel though.)
 func (c Config) validate() error {
- safs := highestKnownABIVersion.supportedAccessFS
- if !c.HandledAccessFS.isSubset(safs) {
+ if !c.HandledAccessFS.valid() {
  return errors.New("unsupported HandledAccessFS value")
  }
  return nil