Răsfoiți Sursa

fix(action): update SUSFS patches to correct user namespace handling in fs/susfs.c

TheWildJames 4 luni în urmă
părinte
comite
2accecc927
1 a modificat fișierele cu 2 adăugiri și 0 ștergeri
  1. 2 0
      .github/actions/susfs/action.yml

+ 2 - 0
.github/actions/susfs/action.yml

@@ -231,6 +231,8 @@ runs:
           perl -i -pe 's/^(\s+if \(inode\) \{)/$1\n\t\t\/\*\n\t\t * IN_ALL_EVENTS represents all of the mask bits\n\t\t * that we expose to userspace.  There is at\n\t\t * least one bit (FS_EVENT_ON_CHILD) which is\n\t\t * used only internally to the kernel.\n\t\t *\/\n\t\tu32 mask = mark->mask & IN_ALL_EVENTS;/m' fs/notify/fdinfo.c
           perl -i -pe 's/\binotify_mark_user_mask\(mark\)/mask, mark->ignored_mask/g' fs/notify/fdinfo.c
           perl -i -pe 's/ignored_mask:0/ignored_mask:%x/g' fs/notify/fdinfo.c
+          sed -i 's|i_uid_into_mnt(i_user_ns(&fi->inode), &fi->inode).val|i_uid_into_mnt(\&init_user_ns, \&fi->inode).val|g' fs/susfs.c
+          sed -i 's|i_uid_into_mnt(i_user_ns(inode), inode).val|i_uid_into_mnt(\&init_user_ns, inode).val|g' fs/susfs.c
         fi
 
     - name: Revert Android 14 6.1 Fake Patches