Răsfoiți Sursa

fix(action): update fdinfo.c patch to correct ignored_mask formatting for Android 12 5.10

Co-authored-by: Copilot <copilot@github.com>
TheWildJames 4 luni în urmă
părinte
comite
f8c04e2d65
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

@@ -97,6 +97,7 @@ runs:
           echo "Applying fdinfo.c Android 12 5.10 Fake Patch"
           sed -i '/^[[:space:]]*\/\*$/,/^[[:space:]]*u32 mask = mark->mask & IN_ALL_EVENTS;$/d' fs/notify/fdinfo.c
           perl -i -pe 's/\bmask,\s*mark->ignored_mask/inotify_mark_user_mask(mark)/g' fs/notify/fdinfo.c
+          perl -i -pe 's/ignored_mask:%x/ignored_mask:0/g' fs/notify/fdinfo.c
         fi
 
     - name: Apply Kernel SUSFS Patches
@@ -183,6 +184,7 @@ runs:
           echo "Reverting fdinfo.c Android 12 5.10 Fake Patch"
           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
         fi
 
     - name: Apply Kernel SUSFS Patches