Merge pull request #48 from NationalSecurityAgency/compatibility-fixes

Compatibility fixes

Author: awandke

bpf/build.rs

@@ -13,6 +13,7 @@ const HAS_TASK_STORAGE_MAP: &str = "BPF_MAP_TYPE_TASK_STORAGE";
 const HAS_BPF_MAP_CREATE: &str = "bpf_map_create";
 const HAS_INODE_SETATTR_IDMAP: &str =
     "(*inode_setattr)(struct mnt_idmap *, struct dentry *, struct iattr *)";
+const HAS_INODE_SETXATTR_IDMAP: &str = "(*inode_setxattr)(struct mnt_idmap *, struct dentry *, const char *, const void *, size_t, int)";
 
 /// Tells Cargo to rerun the build if the supplied file has changed
 fn track_file(header: &str) {
@@ -190,6 +191,7 @@ fn detect_vmlinux_features(vmlinux: &PathBuf) -> Result<HashSet<String>> {
             HAS_BPF_MAP_CREATE,
             HAS_INODE_SETATTR_IDMAP,
             HAS_TASK_STORAGE_MAP,
+            HAS_INODE_SETXATTR_IDMAP,
         ] {
             if line.contains(feat) {
                 found.insert(feat.to_string());
@@ -219,6 +221,8 @@ fn export_features_to_header(features: HashSet<String>, out_path: &Path) -> Resu
             writeln!(f, "#define HAS_BPF_MAP_CREATE")?;
         } else if flag.contains(HAS_INODE_SETATTR_IDMAP) {
             writeln!(f, "#define HAS_INODE_SETATTR_IDMAP")?;
+        } else if flag.contains(HAS_INODE_SETXATTR_IDMAP) {
+            writeln!(f, "#define HAS_INODE_SETXATTR_IDMAP")?;
         }
     }
 

bpf/src/seabee/seabee.bpf.c

@@ -418,9 +418,15 @@ int BPF_PROG(seabee_inode_setattr, struct dentry *dentry, struct iattr *attr)
  * @param dentry file
 */
 SEC("lsm/inode_setxattr")
+#ifdef HAS_INODE_SETXATTR_IDMAP
 int BPF_PROG(seabee_inode_setxattr, struct mnt_idmap *idmap,
              struct dentry *dentry, const char *name, const void *value,
              size_t size, int flags)
+#else
+int BPF_PROG(seabee_inode_setxattr, struct user_namespace *mnt_userns,
+             struct dentry *dentry, const char *name, const void *value,
+             size_t size, int flags)
+#endif
 {
 	return decide_inode_access(INODE_SETXATTR, dentry->d_inode,
 	                           dentry->d_name.name);

scripts/update_root_dependencies.sh

@@ -113,7 +113,7 @@ docker_install() {
   elif [ $USE_DNF -eq 1 ]; then
     dnf -y install dnf-plugins-core
     if command -v dnf5 &>/dev/null; then
-      dnf config-manager addrepo https://download.docker.com/linux/"$DISTRO"/docker-ce.repo
+      dnf config-manager addrepo --from-repofile=https://download.docker.com/linux/"$DISTRO"/docker-ce.repo
     else
       dnf config-manager --add-repo https://download.docker.com/linux/"$DISTRO"/docker-ce.repo
     fi