mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-10-15 03:37:09 -04:00
Remove stale comments from statx patch
This commit is contained in:
1 parent
7e55c0a8b1
commit
db44151615
1 file changed
+2
-18
@@ -11,20 +11,8 @@ diff --git a/src/syscall/seccomp.c b/src/syscall/seccomp.c
|
||||
index ee7b8acd68660f38fd52f56e951ffb94e9061d68..ff3a79b60e9092a296bb444c919bb3861338727f 100644
|
||||
--- a/src/syscall/seccomp.c
|
||||
+++ b/src/syscall/seccomp.c
|
||||
@@ -738,4 +738,4 @@ int enable_syscall_filtering(const Tracee *tracee)
|
||||
- * the statx one emulates the call when it fails, which only a kernel
|
||||
- * before 4.11 does for want of it - a statx Android's policy traps is
|
||||
- * emulated from SIGSYS instead. Both stops re-read and re-translate
|
||||
- * the path, and are paid on every call.
|
||||
+ * the statx one emulates the syscall before 4.11 and supplies MNT_ID
|
||||
+ * from fdinfo through 5.7. Android policy traps are still emulated from
|
||||
+ * SIGSYS instead. Both stops re-read and re-translate the path, and are
|
||||
+ * paid on every call.
|
||||
@@ -764 +764,4 @@ static void drop_unneeded_exit_stops(void)
|
||||
@@ -764 +764 @@ static void drop_unneeded_exit_stops(void)
|
||||
- if (major > 4 || (major == 4 && minor >= 11))
|
||||
+ /* Linux 4.11 introduced statx; Linux 5.8 added MNT_ID.
|
||||
+ * Keep its exit stop through 5.7 so the missing ID can be
|
||||
+ * recovered from the descriptor's fdinfo. */
|
||||
+ if (major > 5 || (major == 5 && minor >= 8))
|
||||
diff --git a/src/tracee/statx.c b/src/tracee/statx.c
|
||||
index ca972f892e84461cb694dd13a37bfbc67527b320..824771ccf5934e1f870fc36a29fb22fdcad0a856 100644
|
||||
@@ -32,11 +20,7 @@ index ca972f892e84461cb694dd13a37bfbc67527b320..824771ccf5934e1f870fc36a29fb22fd
|
||||
+++ b/src/tracee/statx.c
|
||||
@@ -4,0 +5 @@
|
||||
+#include "tracee/statx_mnt_id.h"
|
||||
@@ -125,0 +127,9 @@ int handle_statx_syscall(Tracee *tracee, bool from_sigsys) {
|
||||
+ /* libglnx chases an already-open fd with AT_EMPTY_PATH and requires a
|
||||
+ * mount ID. Kernels before 5.8 can succeed without returning that field.
|
||||
+ * The tracee is stopped at this syscall exit; accept only the ordinary
|
||||
+ * mount ID and verify the fdinfo inode against the statx result. */
|
||||
@@ -125,0 +127,5 @@ int handle_statx_syscall(Tracee *tracee, bool from_sigsys) {
|
||||
+ if (droiddeck_proot_statx_fill_mnt_id(tracee->pid, (int) dirfd,
|
||||
+ (int) flags, guest_path, (unsigned int) mask,
|
||||
+ &state.statx_buf))
|
||||
|
||||
Reference in new issue
Block a user