From e469b3e4e3c02383df0b1d72e960dfa0f11e9602 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Thu, 7 Nov 2024 15:50:59 +0100
Subject: tools/syz-declextract: fix non-determinism and syscall selection

Currently syscall selection is non-deterministic and we frequently
choose wrond ones. This leads to flaky argument names/types,
and wrong argument types (e.g. int16 instead of uid,
old_utimbuf32 instead of utimbuf, etc).

Make syscall selection robust and correct.
---
 sys/linux/auto.txt.json | 46 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 8 deletions(-)

(limited to 'sys/linux/auto.txt.json')

diff --git a/sys/linux/auto.txt.json b/sys/linux/auto.txt.json
index a5f557a36..265df5665 100644
--- a/sys/linux/auto.txt.json
+++ b/sys/linux/auto.txt.json
@@ -5288,6 +5288,16 @@
 			"mm"
 		]
 	},
+	{
+		"type": "SYSCALL",
+		"name": "fadvise64_64",
+		"files": [
+			"arch/x86/kernel/sys_ia32.c"
+		],
+		"subsystems": [
+			"kernel"
+		]
+	},
 	{
 		"type": "SYSCALL",
 		"name": "fallocate",
@@ -5362,10 +5372,10 @@
 		"type": "SYSCALL",
 		"name": "fchown",
 		"files": [
-			"kernel/uid16.c"
+			"fs/open.c"
 		],
 		"subsystems": [
-			"kernel"
+			"fs"
 		]
 	},
 	{
@@ -5558,6 +5568,16 @@
 			"fs"
 		]
 	},
+	{
+		"type": "SYSCALL",
+		"name": "ftruncate64",
+		"files": [
+			"arch/x86/kernel/sys_ia32.c"
+		],
+		"subsystems": [
+			"kernel"
+		]
+	},
 	{
 		"type": "SYSCALL",
 		"name": "futex",
@@ -7736,7 +7756,7 @@
 		"type": "SYSCALL",
 		"name": "setfsgid",
 		"files": [
-			"kernel/uid16.c"
+			"kernel/sys.c"
 		],
 		"subsystems": [
 			"kernel"
@@ -7776,7 +7796,7 @@
 		"type": "SYSCALL",
 		"name": "setgid",
 		"files": [
-			"kernel/uid16.c"
+			"kernel/sys.c"
 		],
 		"subsystems": [
 			"kernel"
@@ -7796,7 +7816,7 @@
 		"type": "SYSCALL",
 		"name": "setgroups",
 		"files": [
-			"kernel/uid16.c"
+			"kernel/groups.c"
 		],
 		"subsystems": [
 			"kernel"
@@ -7866,7 +7886,7 @@
 		"type": "SYSCALL",
 		"name": "setregid",
 		"files": [
-			"kernel/uid16.c"
+			"kernel/sys.c"
 		],
 		"subsystems": [
 			"kernel"
@@ -7906,7 +7926,7 @@
 		"type": "SYSCALL",
 		"name": "setresuid",
 		"files": [
-			"kernel/uid16.c"
+			"kernel/sys.c"
 		],
 		"subsystems": [
 			"kernel"
@@ -7926,7 +7946,7 @@
 		"type": "SYSCALL",
 		"name": "setreuid",
 		"files": [
-			"kernel/uid16.c"
+			"kernel/sys.c"
 		],
 		"subsystems": [
 			"kernel"
@@ -8512,6 +8532,16 @@
 			"fs"
 		]
 	},
+	{
+		"type": "SYSCALL",
+		"name": "truncate64",
+		"files": [
+			"arch/x86/kernel/sys_ia32.c"
+		],
+		"subsystems": [
+			"kernel"
+		]
+	},
 	{
 		"type": "SYSCALL",
 		"name": "ugetrlimit",
-- 
cgit mrf-deployment