tools/syz-declextract: improve name matching heuristics

1 files changed, 95 insertions, 95 deletions

diff --git a/sys/linux/auto.txt b/sys/linux/auto.txt
index 63e72d618..e19dac03d 100644
--- a/sys/linux/auto.txt
+++ b/sys/linux/auto.txt
@@ -194,7 +194,7 @@ _llseek$auto(fd fd, offset_high intptr, offset_low intptr, result ptr[inout, int
 _newselect$auto(n int32, inp ptr[inout, __kernel_fd_set$auto_record], outp ptr[inout, __kernel_fd_set$auto_record], exp ptr[inout, __kernel_fd_set$auto_record], tvp ptr[inout, __kernel_old_timeval$auto_record]) (automatic)
 accept$auto(fd fd, upeer_sockaddr ptr[inout, sockaddr$auto_record], upeer_addrlen ptr[inout, int32]) (automatic)
 accept4$auto(fd fd, upeer_sockaddr ptr[inout, sockaddr$auto_record], upeer_addrlen ptr[inout, int32], flags int32) (automatic)
-access$auto(filename ptr[in, string], mode int32) (automatic)
+access$auto(filename ptr[in, filename], mode int32) (automatic)
 acct$auto(name ptr[in, string]) (automatic)
 add_key$auto(_type ptr[in, string], _description ptr[in, string], _payload ptr[in, array[auto_todo]], plen intptr, ringid int32) (automatic)
 adjtimex$auto(txc_p ptr[inout, __kernel_timex$auto_record]) (automatic)
@@ -207,11 +207,11 @@ brk$auto(brk intptr) (automatic)
 cachestat$auto(fd fd, cstat_range ptr[inout, cachestat_range$auto_record], cstat ptr[inout, cachestat$auto_record], flags int32) (automatic)
 capget$auto(header ptr[inout, __user_cap_header_struct$auto_record], dataptr ptr[inout, __user_cap_data_struct$auto_record]) (automatic)
 capset$auto(header ptr[inout, __user_cap_header_struct$auto_record], data ptr[inout, __user_cap_data_struct$auto_record]) (automatic)
-chdir$auto(filename ptr[in, string]) (automatic)
-chmod$auto(filename ptr[in, string], mode int16) (automatic)
-chown$auto(filename ptr[in, string], user int32, group int32) (automatic)
-chown32$auto(filename ptr[in, string], user int32, group int32) (automatic)
-chroot$auto(filename ptr[in, string]) (automatic)
+chdir$auto(filename ptr[in, filename]) (automatic)
+chmod$auto(filename ptr[in, filename], mode int16) (automatic)
+chown$auto(filename ptr[in, filename], user uid, group gid) (automatic)
+chown32$auto(filename ptr[in, filename], user uid, group gid) (automatic)
+chroot$auto(filename ptr[in, filename]) (automatic)
 clock_adjtime$auto(which_clock int32, utx ptr[inout, __kernel_timex$auto_record]) (automatic)
 clock_adjtime64$auto(which_clock int32, utx ptr[inout, __kernel_timex$auto_record]) (automatic)
 clock_getres$auto(which_clock int32, tp ptr[inout, __kernel_timespec$auto_record]) (automatic)
@@ -228,9 +228,9 @@ close$auto(fd fd) (automatic)
 close_range$auto(fd fd, max_fd fd, flags int32) (automatic)
 connect$auto(fd fd, uservaddr ptr[inout, sockaddr$auto_record], addrlen int32) (automatic)
 copy_file_range$auto(fd_in fd, off_in ptr[inout, int64], fd_out fd, off_out ptr[inout, int64], len intptr, flags int32) (automatic)
-creat$auto(pathname ptr[in, string], mode int16) (automatic)
+creat$auto(pathname ptr[in, filename], mode int16) (automatic)
 delete_module$auto(name_user ptr[in, string], flags int32) (automatic)
-dup$auto(fildes int32) (automatic)
+dup$auto(fildes fd) (automatic)
 dup2$auto(oldfd fd, newfd fd) (automatic)
 dup3$auto(oldfd fd, newfd fd, flags int32) (automatic)
 epoll_create$auto(size int32) (automatic)
@@ -241,24 +241,24 @@ epoll_pwait2$auto(epfd fd, events ptr[inout, epoll_event$auto_record], maxevents
 epoll_wait$auto(epfd fd, events ptr[inout, epoll_event$auto_record], maxevents int32, timeout int32) (automatic)
 eventfd$auto(count int32) (automatic)
 eventfd2$auto(count int32, flags int32) (automatic)
-execve$auto(filename ptr[in, string], argv ptr[in, ptr[in, string]], envp ptr[in, ptr[in, string]]) (automatic)
-execveat$auto(fd fd, filename ptr[in, string], argv ptr[in, ptr[in, string]], envp ptr[in, ptr[in, string]], flags int32) (automatic)
+execve$auto(filename ptr[in, filename], argv ptr[in, ptr[in, string]], envp ptr[in, ptr[in, string]]) (automatic)
+execveat$auto(fd fd, filename ptr[in, filename], argv ptr[in, ptr[in, string]], envp ptr[in, ptr[in, string]], flags int32) (automatic)
 exit$auto(error_code int32) (automatic)
 exit_group$auto(error_code int32) (automatic)
-faccessat$auto(dfd fd_dir, filename ptr[in, string], mode int32) (automatic)
-faccessat2$auto(dfd fd_dir, filename ptr[in, string], mode int32, flags int32) (automatic)
+faccessat$auto(dfd fd_dir, filename ptr[in, filename], mode int32) (automatic)
+faccessat2$auto(dfd fd_dir, filename ptr[in, filename], mode int32, flags int32) (automatic)
 fadvise64$auto(fd fd, offset intptr, len intptr, advice int32) (automatic)
 fadvise64_64$auto(fd fd, offset_low int32, offset_high int32, len_low int32, len_high int32, advice int32) (automatic)
 fallocate$auto(fd fd, mode int32, offset intptr, len intptr) (automatic)
 fanotify_init$auto(flags int32, event_f_flags int32) (automatic)
-fanotify_mark$auto(fanotify_fd fd, flags int32, mask intptr, dfd fd_dir, pathname ptr[in, string]) (automatic)
+fanotify_mark$auto(fanotify_fd fd, flags int32, mask intptr, dfd fd_dir, pathname ptr[in, filename]) (automatic)
 fchdir$auto(fd fd) (automatic)
 fchmod$auto(fd fd, mode int16) (automatic)
-fchmodat$auto(dfd fd_dir, filename ptr[in, string], mode int16) (automatic)
-fchmodat2$auto(dfd fd_dir, filename ptr[in, string], mode int16, flags int32) (automatic)
-fchown$auto(fd fd, user int32, group int32) (automatic)
-fchown32$auto(fd fd, user int32, group int32) (automatic)
-fchownat$auto(dfd fd_dir, filename ptr[in, string], user int32, group int32, flag int32) (automatic)
+fchmodat$auto(dfd fd_dir, filename ptr[in, filename], mode int16) (automatic)
+fchmodat2$auto(dfd fd_dir, filename ptr[in, filename], mode int16, flags int32) (automatic)
+fchown$auto(fd fd, user uid, group gid) (automatic)
+fchown32$auto(fd fd, user uid, group gid) (automatic)
+fchownat$auto(dfd fd_dir, filename ptr[in, filename], user uid, group gid, flag int32) (automatic)
 fcntl$auto(fd fd, cmd int32, arg intptr) (automatic)
 fdatasync$auto(fd fd) (automatic)
 fgetxattr$auto(fd fd, name ptr[in, string], value ptr[inout, array[auto_todo]], size intptr) (automatic)
@@ -270,7 +270,7 @@ fsconfig$auto(fd fd, cmd int32, _key ptr[in, string], _value ptr[in, array[auto_
 fsetxattr$auto(fd fd, name ptr[in, string], value ptr[in, array[auto_todo]], size intptr, flags int32) (automatic)
 fsmount$auto(fs_fd fd, flags int32, attr_flags int32) (automatic)
 fsopen$auto(_fs_name ptr[in, string], flags int32) (automatic)
-fspick$auto(dfd fd_dir, path ptr[in, string], flags int32) (automatic)
+fspick$auto(dfd fd_dir, path ptr[in, filename], flags int32) (automatic)
 fstat$auto(fd fd, statbuf ptr[inout, stat$auto_record]) (automatic)
 fstatfs$auto(fd fd, buf ptr[inout, statfs$auto_record]) (automatic)
 fstatfs64$auto(fd fd, sz intptr, buf ptr[inout, statfs64$auto_record]) (automatic)
@@ -283,7 +283,7 @@ futex_time64$auto(uaddr ptr[inout, int32], op int32, val int32, utime ptr[in, __
 futex_wait$auto(uaddr ptr[inout, array[auto_todo]], val intptr, mask intptr, flags int32, timeout ptr[inout, __kernel_timespec$auto_record], clockid int32) (automatic)
 futex_waitv$auto(waiters ptr[inout, futex_waitv$auto_record], nr_futexes int32, flags int32, timeout ptr[inout, __kernel_timespec$auto_record], clockid int32) (automatic)
 futex_wake$auto(uaddr ptr[inout, array[auto_todo]], mask intptr, nr int32, flags int32) (automatic)
-futimesat$auto(dfd fd_dir, filename ptr[in, string], utimes ptr[inout, __kernel_old_timeval$auto_record]) (automatic)
+futimesat$auto(dfd fd_dir, filename ptr[in, filename], utimes ptr[inout, __kernel_old_timeval$auto_record]) (automatic)
 get_mempolicy$auto(policy ptr[inout, int32], nmask ptr[inout, intptr], maxnode intptr, addr intptr, flags intptr) (automatic)
 get_robust_list$auto(pid pid, head_ptr ptr[inout, ptr[inout, robust_list_head$auto_record]], len_ptr ptr[inout, intptr]) (automatic)
 get_thread_area$auto(u_info ptr[inout, user_desc$auto_record]) (automatic)
@@ -308,9 +308,9 @@ getsid$auto(pid pid) (automatic)
 getsockname$auto(fd fd, usockaddr ptr[inout, sockaddr$auto_record], usockaddr_len ptr[inout, int32]) (automatic)
 getsockopt$auto(fd fd, level int32, optname int32, optval ptr[inout, string], optlen ptr[inout, int32]) (automatic)
 gettimeofday$auto(tv ptr[inout, __kernel_old_timeval$auto_record], tz ptr[inout, timezone$auto_record]) (automatic)
-getxattr$auto(pathname ptr[in, string], name ptr[in, string], value ptr[inout, array[auto_todo]], size intptr) (automatic)
+getxattr$auto(pathname ptr[in, filename], name ptr[in, string], value ptr[inout, array[auto_todo]], size intptr) (automatic)
 init_module$auto(umod ptr[inout, array[auto_todo]], len intptr, uargs ptr[in, string]) (automatic)
-inotify_add_watch$auto(fd fd, pathname ptr[in, string], mask int32) (automatic)
+inotify_add_watch$auto(fd fd, pathname ptr[in, filename], mask int32) (automatic)
 inotify_init1$auto(flags int32) (automatic)
 inotify_rm_watch$auto(fd fd, wd int32) (automatic)
 io_cancel$auto(ctx_id intptr, iocb ptr[inout, iocb$auto_record], result ptr[inout, io_event$auto_record]) (automatic)
@@ -335,22 +335,22 @@ kill$auto(pid pid, sig int32) (automatic)
 landlock_add_rule$auto(ruleset_fd fd, rule_type flags[landlock_rule_type], rule_attr ptr[in, array[auto_todo]], flags int32) (automatic)
 landlock_create_ruleset$auto(attr ptr[in, landlock_ruleset_attr$auto_record], size intptr, flags int32) (automatic)
 landlock_restrict_self$auto(ruleset_fd fd, flags int32) (automatic)
-lchown$auto(filename ptr[in, string], user int32, group int32) (automatic)
-lchown32$auto(filename ptr[in, string], user int32, group int32) (automatic)
-lgetxattr$auto(pathname ptr[in, string], name ptr[in, string], value ptr[inout, array[auto_todo]], size intptr) (automatic)
-link$auto(oldname ptr[in, string], newname ptr[in, string]) (automatic)
-linkat$auto(olddfd fd_dir, oldname ptr[in, string], newdfd fd_dir, newname ptr[in, string], flags int32) (automatic)
+lchown$auto(filename ptr[in, filename], user uid, group gid) (automatic)
+lchown32$auto(filename ptr[in, filename], user uid, group gid) (automatic)
+lgetxattr$auto(pathname ptr[in, filename], name ptr[in, string], value ptr[inout, array[auto_todo]], size intptr) (automatic)
+link$auto(oldname ptr[in, filename], newname ptr[in, filename]) (automatic)
+linkat$auto(olddfd fd_dir, oldname ptr[in, filename], newdfd fd_dir, newname ptr[in, filename], flags int32) (automatic)
 listen$auto(fd fd, backlog int32) (automatic)
 listmount$auto(req ptr[in, mnt_id_req$auto_record], mnt_ids ptr[inout, int64], nr_mnt_ids intptr, flags int32) (automatic)
-listxattr$auto(pathname ptr[in, string], list ptr[inout, string], size intptr) (automatic)
-llistxattr$auto(pathname ptr[in, string], list ptr[inout, string], size intptr) (automatic)
-lremovexattr$auto(pathname ptr[in, string], name ptr[in, string]) (automatic)
+listxattr$auto(pathname ptr[in, filename], list ptr[inout, string], size intptr) (automatic)
+llistxattr$auto(pathname ptr[in, filename], list ptr[inout, string], size intptr) (automatic)
+lremovexattr$auto(pathname ptr[in, filename], name ptr[in, string]) (automatic)
 lseek$auto(fd fd, offset intptr, whence int32) (automatic)
-lsetxattr$auto(pathname ptr[in, string], name ptr[in, string], value ptr[in, array[auto_todo]], size intptr, flags int32) (automatic)
+lsetxattr$auto(pathname ptr[in, filename], name ptr[in, string], value ptr[in, array[auto_todo]], size intptr, flags int32) (automatic)
 lsm_get_self_attr$auto(attr int32, ctx ptr[inout, lsm_ctx$auto_record], size ptr[inout, int32], flags int32) (automatic)
 lsm_list_modules$auto(ids ptr[inout, int64], size ptr[inout, int32], flags int32) (automatic)
 lsm_set_self_attr$auto(attr int32, ctx ptr[inout, lsm_ctx$auto_record], size int32, flags int32) (automatic)
-lstat$auto(filename ptr[in, string], statbuf ptr[inout, stat$auto_record]) (automatic)
+lstat$auto(filename ptr[in, filename], statbuf ptr[inout, stat$auto_record]) (automatic)
 madvise$auto(start intptr, len_in intptr, behavior int32) (automatic)
 map_shadow_stack$auto(addr intptr, size intptr, flags int32) (automatic)
 mbind$auto(start intptr, len intptr, mode intptr, nmask ptr[in, intptr], maxnode intptr, flags int32) (automatic)
@@ -359,19 +359,19 @@ memfd_create$auto(uname ptr[in, string], flags int32) (automatic)
 memfd_secret$auto(flags int32) (automatic)
 migrate_pages$auto(pid pid, maxnode intptr, old_nodes ptr[in, intptr], new_nodes ptr[in, intptr]) (automatic)
 mincore$auto(start intptr, len intptr, vec ptr[inout, string]) (automatic)
-mkdir$auto(pathname ptr[in, string], mode int16) (automatic)
-mkdirat$auto(dfd fd_dir, pathname ptr[in, string], mode int16) (automatic)
-mknod$auto(filename ptr[in, string], mode int16, dev int32) (automatic)
-mknodat$auto(dfd fd_dir, filename ptr[in, string], mode int16, dev int32) (automatic)
+mkdir$auto(pathname ptr[in, filename], mode int16) (automatic)
+mkdirat$auto(dfd fd_dir, pathname ptr[in, filename], mode int16) (automatic)
+mknod$auto(filename ptr[in, filename], mode int16, dev int32) (automatic)
+mknodat$auto(dfd fd_dir, filename ptr[in, filename], mode int16, dev int32) (automatic)
 mlock$auto(start intptr, len intptr) (automatic)
 mlock2$auto(start intptr, len intptr, flags int32) (automatic)
 mlockall$auto(flags int32) (automatic)
 mmap$auto(addr intptr, len intptr, prot intptr, flags intptr, fd intptr, off intptr) (automatic)
 mmap2$auto(addr intptr, len intptr, prot intptr, flags intptr, fd intptr, pgoff intptr) (automatic)
 modify_ldt$auto(func int32, ptr ptr[inout, array[auto_todo]], bytecount intptr) (automatic)
-mount$auto(dev_name ptr[inout, devname], dir_name ptr[inout, string], type ptr[inout, string], flags intptr, data ptr[inout, array[auto_todo]]) (automatic)
-mount_setattr$auto(dfd fd_dir, path ptr[in, string], flags int32, uattr ptr[inout, mount_attr$auto_record], usize intptr) (automatic)
-move_mount$auto(from_dfd fd_dir, from_pathname ptr[in, string], to_dfd fd_dir, to_pathname ptr[in, string], flags int32) (automatic)
+mount$auto(dev_name ptr[inout, devname], dir_name ptr[inout, filename], type ptr[inout, string], flags intptr, data ptr[inout, array[auto_todo]]) (automatic)
+mount_setattr$auto(dfd fd_dir, path ptr[in, filename], flags int32, uattr ptr[inout, mount_attr$auto_record], usize intptr) (automatic)
+move_mount$auto(from_dfd fd_dir, from_pathname ptr[in, filename], to_dfd fd_dir, to_pathname ptr[in, filename], flags int32) (automatic)
 move_pages$auto(pid pid, nr_pages intptr, pages ptr[inout, ptr[in, array[auto_todo]]], nodes ptr[in, int32], status ptr[inout, int32], flags int32) (automatic)
 mprotect$auto(start intptr, len intptr, prot intptr) (automatic)
 mq_getsetattr$auto(mqdes int32, u_mqstat ptr[in, mq_attr$auto_record], u_omqstat ptr[inout, mq_attr$auto_record]) (automatic)
@@ -393,25 +393,25 @@ munlock$auto(start intptr, len intptr) (automatic)
 munmap$auto(addr intptr, len intptr) (automatic)
 name_to_handle_at$auto(dfd fd_dir, name ptr[in, string], handle ptr[inout, file_handle$auto_record], mnt_id ptr[inout, array[auto_todo]], flag int32) (automatic)
 nanosleep$auto(rqtp ptr[inout, __kernel_timespec$auto_record], rmtp ptr[inout, __kernel_timespec$auto_record]) (automatic)
-newfstatat$auto(dfd fd_dir, filename ptr[in, string], statbuf ptr[inout, stat$auto_record], flag int32) (automatic)
+newfstatat$auto(dfd fd_dir, filename ptr[in, filename], statbuf ptr[inout, stat$auto_record], flag int32) (automatic)
 nice$auto(increment int32) (automatic)
 oldfstat$auto(fd fd, statbuf ptr[inout, __old_kernel_stat$auto_record]) (automatic)
-oldlstat$auto(filename ptr[in, string], statbuf ptr[inout, __old_kernel_stat$auto_record]) (automatic)
+oldlstat$auto(filename ptr[in, filename], statbuf ptr[inout, __old_kernel_stat$auto_record]) (automatic)
 oldolduname$auto(name ptr[inout, oldold_utsname$auto_record]) (automatic)
-oldstat$auto(filename ptr[in, string], statbuf ptr[inout, __old_kernel_stat$auto_record]) (automatic)
+oldstat$auto(filename ptr[in, filename], statbuf ptr[inout, __old_kernel_stat$auto_record]) (automatic)
 olduname$auto(name ptr[inout, old_utsname$auto_record]) (automatic)
-open$auto(filename ptr[in, string], flags int32, mode int16) (automatic)
+open$auto(filename ptr[in, filename], flags int32, mode int16) (automatic)
 open_by_handle_at$auto(mountdirfd fd, handle ptr[inout, file_handle$auto_record], flags int32) (automatic)
-open_tree$auto(dfd fd_dir, filename ptr[in, string], flags int32) (automatic)
-openat$auto(dfd fd_dir, filename ptr[in, string], flags int32, mode int16) (automatic)
-openat2$auto(dfd fd_dir, filename ptr[in, string], how ptr[inout, open_how$auto_record], usize intptr) (automatic)
+open_tree$auto(dfd fd_dir, filename ptr[in, filename], flags int32) (automatic)
+openat$auto(dfd fd_dir, filename ptr[in, filename], flags int32, mode int16) (automatic)
+openat2$auto(dfd fd_dir, filename ptr[in, filename], how ptr[inout, open_how$auto_record], usize intptr) (automatic)
 perf_event_open$auto(attr_uptr ptr[inout, perf_event_attr$auto_record], pid pid, cpu int32, group_fd fd, flags intptr) (automatic)
 personality$auto(personality int32) (automatic)
-pidfd_getfd$auto(pidfd fd_dir, fd fd, flags int32) (automatic)
+pidfd_getfd$auto(pidfd fd, fd fd, flags int32) (automatic)
 pidfd_open$auto(pid pid, flags int32) (automatic)
-pidfd_send_signal$auto(pidfd fd_dir, sig int32, info ptr[inout, siginfo$auto_record], flags int32) (automatic)
-pipe$auto(fildes ptr[inout, int32]) (automatic)
-pipe2$auto(fildes ptr[inout, int32], flags int32) (automatic)
+pidfd_send_signal$auto(pidfd fd, sig int32, info ptr[inout, siginfo$auto_record], flags int32) (automatic)
+pipe$auto(fildes ptr[inout, fd]) (automatic)
+pipe2$auto(fildes ptr[inout, fd], flags int32) (automatic)
 pivot_root$auto(new_root ptr[in, string], put_old ptr[in, string]) (automatic)
 pkey_alloc$auto(flags intptr, init_val intptr) (automatic)
 pkey_free$auto(pkey int32) (automatic)
@@ -424,8 +424,8 @@ pread64$auto(fd fd, buf ptr[inout, string], count intptr, pos intptr) (automatic
 preadv$auto(fd intptr, vec ptr[in, iovec$auto_record], vlen intptr, pos_l intptr, pos_h intptr) (automatic)
 preadv2$auto(fd intptr, vec ptr[in, iovec$auto_record], vlen intptr, pos_l intptr, pos_h intptr, flags int32) (automatic)
 prlimit64$auto(pid pid, _resource int32, new_rlim ptr[in, rlimit64$auto_record], old_rlim ptr[inout, rlimit64$auto_record]) (automatic)
-process_madvise$auto(pidfd fd_dir, vec ptr[in, iovec$auto_record], vlen intptr, behavior int32, flags int32) (automatic)
-process_mrelease$auto(pidfd fd_dir, flags int32) (automatic)
+process_madvise$auto(pidfd fd, vec ptr[in, iovec$auto_record], vlen intptr, behavior int32, flags int32) (automatic)
+process_mrelease$auto(pidfd fd, flags int32) (automatic)
 process_vm_readv$auto(pid pid, lvec ptr[in, iovec$auto_record], liovcnt intptr, rvec ptr[in, iovec$auto_record], riovcnt intptr, flags intptr) (automatic)
 process_vm_writev$auto(pid pid, lvec ptr[in, iovec$auto_record], liovcnt intptr, rvec ptr[in, iovec$auto_record], riovcnt intptr, flags intptr) (automatic)
 pselect6$auto(n int32, inp ptr[inout, __kernel_fd_set$auto_record], outp ptr[inout, __kernel_fd_set$auto_record], exp ptr[inout, __kernel_fd_set$auto_record], tsp ptr[inout, __kernel_timespec$auto_record], sig ptr[inout, array[auto_todo]]) (automatic)
@@ -439,8 +439,8 @@ quotactl_fd$auto(fd fd, cmd int32, id int32, addr ptr[inout, array[auto_todo]])
 read$auto(fd fd, buf ptr[inout, string], count intptr) (automatic)
 readahead$auto(fd fd, offset intptr, count intptr) (automatic)
 readdir$auto(fd fd, dirent ptr[inout, old_linux_dirent$auto_record], count int32) (automatic)
-readlink$auto(path ptr[in, string], buf ptr[inout, string], bufsiz int32) (automatic)
-readlinkat$auto(dfd fd_dir, pathname ptr[in, string], buf ptr[inout, string], bufsiz int32) (automatic)
+readlink$auto(path ptr[in, filename], buf ptr[inout, string], bufsiz int32) (automatic)
+readlinkat$auto(dfd fd_dir, pathname ptr[in, filename], buf ptr[inout, string], bufsiz int32) (automatic)
 readv$auto(fd intptr, vec ptr[in, iovec$auto_record], vlen intptr) (automatic)
 recv$auto(fd fd, ubuf ptr[inout, array[auto_todo]], size intptr, flags int32) (automatic)
 recvfrom$auto(fd fd, ubuf ptr[inout, array[auto_todo]], size intptr, flags int32, addr ptr[inout, sockaddr$auto_record], addr_len ptr[inout, int32]) (automatic)
@@ -448,12 +448,12 @@ recvmmsg$auto(fd fd, mmsg ptr[inout, mmsghdr$auto_record], vlen int32, flags int
 recvmmsg_time64$auto(fd fd, mmsg ptr[inout, mmsghdr$auto_record], vlen int32, flags int32, timeout ptr[inout, __kernel_timespec$auto_record]) (automatic)
 recvmsg$auto(fd fd, msg ptr[inout, user_msghdr$auto_record], flags int32) (automatic)
 remap_file_pages$auto(start intptr, size intptr, prot intptr, pgoff intptr, flags intptr) (automatic)
-removexattr$auto(pathname ptr[in, string], name ptr[in, string]) (automatic)
-rename$auto(oldname ptr[in, string], newname ptr[in, string]) (automatic)
-renameat$auto(olddfd fd_dir, oldname ptr[in, string], newdfd fd_dir, newname ptr[in, string]) (automatic)
-renameat2$auto(olddfd fd_dir, oldname ptr[in, string], newdfd fd_dir, newname ptr[in, string], flags int32) (automatic)
+removexattr$auto(pathname ptr[in, filename], name ptr[in, string]) (automatic)
+rename$auto(oldname ptr[in, filename], newname ptr[in, filename]) (automatic)
+renameat$auto(olddfd fd_dir, oldname ptr[in, filename], newdfd fd_dir, newname ptr[in, filename]) (automatic)
+renameat2$auto(olddfd fd_dir, oldname ptr[in, filename], newdfd fd_dir, newname ptr[in, filename], flags int32) (automatic)
 request_key$auto(_type ptr[in, string], _description ptr[in, string], _callout_info ptr[in, string], destringid int32) (automatic)
-rmdir$auto(pathname ptr[in, string]) (automatic)
+rmdir$auto(pathname ptr[in, filename]) (automatic)
 rseq$auto(rseq ptr[inout, rseq$auto_record], rseq_len int32, flags int32, sig int32) (automatic)
 rt_sigaction$auto(sig int32, act ptr[in, sigaction$auto_record], oact ptr[inout, sigaction$auto_record], sigsetsize intptr) (automatic)
 rt_sigpending$auto(uset ptr[inout, sigset_t$auto_record], sigsetsize intptr) (automatic)
@@ -462,7 +462,7 @@ rt_sigqueueinfo$auto(pid pid, sig int32, uinfo ptr[inout, siginfo$auto_record])
 rt_sigsuspend$auto(unewset ptr[inout, sigset_t$auto_record], sigsetsize intptr) (automatic)
 rt_sigtimedwait$auto(uthese ptr[in, sigset_t$auto_record], uinfo ptr[inout, siginfo$auto_record], uts ptr[in, __kernel_timespec$auto_record], sigsetsize intptr) (automatic)
 rt_sigtimedwait_time64$auto(uthese ptr[in, sigset_t$auto_record], uinfo ptr[inout, siginfo$auto_record], uts ptr[in, __kernel_timespec$auto_record], sigsetsize intptr) (automatic)
-rt_tgsigqueueinfo$auto(tgid int32, pid pid, sig int32, uinfo ptr[inout, siginfo$auto_record]) (automatic)
+rt_tgsigqueueinfo$auto(tgid pid, pid pid, sig int32, uinfo ptr[inout, siginfo$auto_record]) (automatic)
 sched_get_priority_max$auto(policy int32) (automatic)
 sched_get_priority_min$auto(policy int32) (automatic)
 sched_getaffinity$auto(pid pid, len int32, user_mask_ptr ptr[inout, intptr]) (automatic)
@@ -971,22 +971,22 @@ setgroups32$auto(gidsetsize int32, grouplist ptr[inout, int32]) (automatic)
 sethostname$auto(name ptr[inout, string], len int32) (automatic)
 setitimer$auto(which int32, value ptr[inout, __kernel_old_itimerval$auto_record], ovalue ptr[inout, __kernel_old_itimerval$auto_record]) (automatic)
 setns$auto(fd fd, flags int32) (automatic)
-setpgid$auto(pid pid, pgid int32) (automatic)
+setpgid$auto(pid pid, pgid pid) (automatic)
 setpriority$auto(which int32, who int32, niceval int32) (automatic)
-setregid$auto(rgid int32, egid int32) (automatic)
-setregid32$auto(rgid int32, egid int32) (automatic)
-setresgid$auto(rgid int32, egid int32, sgid int32) (automatic)
-setresgid32$auto(rgid int32, egid int32, sgid int32) (automatic)
-setresuid$auto(ruid int32, euid int32, suid int32) (automatic)
-setresuid32$auto(ruid int32, euid int32, suid int32) (automatic)
-setreuid$auto(ruid int32, euid int32) (automatic)
-setreuid32$auto(ruid int32, euid int32) (automatic)
+setregid$auto(rgid gid, egid gid) (automatic)
+setregid32$auto(rgid gid, egid gid) (automatic)
+setresgid$auto(rgid gid, egid gid, sgid gid) (automatic)
+setresgid32$auto(rgid gid, egid gid, sgid gid) (automatic)
+setresuid$auto(ruid uid, euid uid, suid uid) (automatic)
+setresuid32$auto(ruid uid, euid uid, suid uid) (automatic)
+setreuid$auto(ruid uid, euid uid) (automatic)
+setreuid32$auto(ruid uid, euid uid) (automatic)
 setrlimit$auto(_resource int32, rlim ptr[inout, rlimit$auto_record]) (automatic)
 setsockopt$auto(fd fd, level int32, optname int32, optval ptr[inout, string], optlen int32) (automatic)
 settimeofday$auto(tv ptr[inout, __kernel_old_timeval$auto_record], tz ptr[inout, timezone$auto_record]) (automatic)
 setuid$auto(uid uid) (automatic)
 setuid32$auto(uid uid) (automatic)
-setxattr$auto(pathname ptr[in, string], name ptr[in, string], value ptr[in, array[auto_todo]], size intptr, flags int32) (automatic)
+setxattr$auto(pathname ptr[in, filename], name ptr[in, string], value ptr[in, array[auto_todo]], size intptr, flags int32) (automatic)
 shmat$auto(shmid int32, shmaddr ptr[inout, string], shmflg int32) (automatic)
 shmctl$auto(shmid int32, cmd int32, buf ptr[inout, shmid_ds$auto_record]) (automatic)
 shmdt$auto(shmaddr ptr[inout, string]) (automatic)
@@ -1004,16 +1004,16 @@ socketcall$auto(call int32, args ptr[inout, intptr]) (automatic)
 socketpair$auto(family int32, type int32, protocol int32, usockvec ptr[inout, int32]) (automatic)
 splice$auto(fd_in fd, off_in ptr[inout, int64], fd_out fd, off_out ptr[inout, int64], len intptr, flags int32) (automatic)
 ssetmask$auto(newmask int32) (automatic)
-stat$auto(filename ptr[in, string], statbuf ptr[inout, stat$auto_record]) (automatic)
-statfs$auto(pathname ptr[in, string], buf ptr[inout, statfs$auto_record]) (automatic)
-statfs64$auto(pathname ptr[in, string], sz intptr, buf ptr[inout, statfs64$auto_record]) (automatic)
+stat$auto(filename ptr[in, filename], statbuf ptr[inout, stat$auto_record]) (automatic)
+statfs$auto(pathname ptr[in, filename], buf ptr[inout, statfs$auto_record]) (automatic)
+statfs64$auto(pathname ptr[in, filename], sz intptr, buf ptr[inout, statfs64$auto_record]) (automatic)
 statmount$auto(req ptr[in, mnt_id_req$auto_record], buf ptr[inout, statmount$auto_record], bufsize intptr, flags int32) (automatic)
-statx$auto(dfd fd_dir, filename ptr[in, string], flags int32, mask int32, buffer ptr[inout, statx$auto_record]) (automatic)
+statx$auto(dfd fd_dir, filename ptr[in, filename], flags int32, mask int32, buffer ptr[inout, statx$auto_record]) (automatic)
 stime$auto(tptr ptr[inout, int32]) (automatic)
 swapoff$auto(specialfile ptr[in, string]) (automatic)
 swapon$auto(specialfile ptr[in, string], swap_flags int32) (automatic)
-symlink$auto(oldname ptr[in, string], newname ptr[in, string]) (automatic)
-symlinkat$auto(oldname ptr[in, string], newdfd fd_dir, newname ptr[in, string]) (automatic)
+symlink$auto(oldname ptr[in, filename], newname ptr[in, filename]) (automatic)
+symlinkat$auto(oldname ptr[in, filename], newdfd fd_dir, newname ptr[in, filename]) (automatic)
 sync_file_range$auto(fd fd, offset intptr, nbytes intptr, flags int32) (automatic)
 sync_file_range2$auto(fd fd, flags int32, offset intptr, nbytes intptr) (automatic)
 syncfs$auto(fd fd) (automatic)
@@ -1062,8 +1062,8 @@ syz_genetlink_get_family_id$auto_tcp_metrics(name ptr[in, string["tcp_metrics"]]
 syz_genetlink_get_family_id$auto_thermal(name ptr[in, string["thermal"]], fd sock_nl_generic) genl_thermal_family_id_auto (automatic)
 syz_genetlink_get_family_id$auto_vdpa(name ptr[in, string["vdpa"]], fd sock_nl_generic) genl_vdpa_family_id_auto (automatic)
 syz_genetlink_get_family_id$auto_wireguard(name ptr[in, string["wireguard"]], fd sock_nl_generic) genl_wireguard_family_id_auto (automatic)
-tee$auto(fdin int32, fdout int32, len intptr, flags int32) (automatic)
-tgkill$auto(tgid int32, pid pid, sig int32) (automatic)
+tee$auto(fdin fd, fdout fd, len intptr, flags int32) (automatic)
+tgkill$auto(tgid pid, pid pid, sig int32) (automatic)
 time$auto(tloc ptr[inout, intptr]) (automatic)
 timer_create$auto(which_clock int32, timer_event_spec ptr[inout, sigevent$auto_record], created_timer_id ptr[inout, int32]) (automatic)
 timer_delete$auto(timer_id int32) (automatic)
@@ -1079,22 +1079,22 @@ timerfd_settime$auto(ufd fd, flags int32, utmr ptr[in, __kernel_itimerspec$auto_
 timerfd_settime64$auto(ufd fd, flags int32, utmr ptr[in, __kernel_itimerspec$auto_record], otmr ptr[inout, __kernel_itimerspec$auto_record]) (automatic)
 times$auto(tbuf ptr[inout, tms$auto_record]) (automatic)
 tkill$auto(pid pid, sig int32) (automatic)
-truncate$auto(path ptr[in, string], length intptr) (automatic)
-truncate64$auto(filename ptr[in, string], offset_low intptr, offset_high intptr) (automatic)
+truncate$auto(path ptr[in, filename], length intptr) (automatic)
+truncate64$auto(filename ptr[in, filename], offset_low intptr, offset_high intptr) (automatic)
 ugetrlimit$auto(_resource int32, rlim ptr[inout, rlimit$auto_record]) (automatic)
 umask$auto(mask int32) (automatic)
 umount$auto(name ptr[inout, string]) (automatic)
 umount2$auto(name ptr[inout, string], flags int32) (automatic)
 uname$auto(name ptr[inout, new_utsname$auto_record]) (automatic)
-unlink$auto(pathname ptr[in, string]) (automatic)
-unlinkat$auto(dfd fd_dir, pathname ptr[in, string], flag int32) (automatic)
+unlink$auto(pathname ptr[in, filename]) (automatic)
+unlinkat$auto(dfd fd_dir, pathname ptr[in, filename], flag int32) (automatic)
 unshare$auto(unshare_flags intptr) (automatic)
 userfaultfd$auto(flags int32) (automatic)
 ustat$auto(dev int32, ubuf ptr[inout, ustat$auto_record]) (automatic)
-utime$auto(filename ptr[inout, string], times ptr[inout, utimbuf$auto_record]) (automatic)
-utimensat$auto(dfd fd_dir, filename ptr[in, string], utimes ptr[inout, __kernel_timespec$auto_record], flags int32) (automatic)
-utimensat_time64$auto(dfd fd_dir, filename ptr[in, string], utimes ptr[inout, __kernel_timespec$auto_record], flags int32) (automatic)
-utimes$auto(filename ptr[inout, string], utimes ptr[inout, __kernel_old_timeval$auto_record]) (automatic)
+utime$auto(filename ptr[inout, filename], times ptr[inout, utimbuf$auto_record]) (automatic)
+utimensat$auto(dfd fd_dir, filename ptr[in, filename], utimes ptr[inout, __kernel_timespec$auto_record], flags int32) (automatic)
+utimensat_time64$auto(dfd fd_dir, filename ptr[in, filename], utimes ptr[inout, __kernel_timespec$auto_record], flags int32) (automatic)
+utimes$auto(filename ptr[inout, filename], utimes ptr[inout, __kernel_old_timeval$auto_record]) (automatic)
 vmsplice$auto(fd fd, uiov ptr[in, iovec$auto_record], nr_segs intptr, flags int32) (automatic)
 wait4$auto(upid int32, stat_addr ptr[inout, int32], options int32, ru ptr[inout, rusage$auto_record]) (automatic)
 waitid$auto(which int32, upid int32, infop ptr[inout, siginfo$auto_record], options int32, ru ptr[inout, rusage$auto_record]) (automatic)
@@ -1293,10 +1293,10 @@ batadv_netlink_policy$auto_netlink [
 	BATADV_ATTR_VERSION				nlattr[BATADV_ATTR_VERSION, stringnoz]
 	BATADV_ATTR_ALGO_NAME				nlattr[BATADV_ATTR_ALGO_NAME, stringnoz]
 	BATADV_ATTR_MESH_IFINDEX			nlattr[BATADV_ATTR_MESH_IFINDEX, ifindex]
-	BATADV_ATTR_MESH_IFNAME				nlattr[BATADV_ATTR_MESH_IFNAME, stringnoz]
+	BATADV_ATTR_MESH_IFNAME				nlattr[BATADV_ATTR_MESH_IFNAME, devname]
 	BATADV_ATTR_MESH_ADDRESS			nlattr[BATADV_ATTR_MESH_ADDRESS, array[int8, 6]]
 	BATADV_ATTR_HARD_IFINDEX			nlattr[BATADV_ATTR_HARD_IFINDEX, ifindex]
-	BATADV_ATTR_HARD_IFNAME				nlattr[BATADV_ATTR_HARD_IFNAME, stringnoz]
+	BATADV_ATTR_HARD_IFNAME				nlattr[BATADV_ATTR_HARD_IFNAME, devname]
 	BATADV_ATTR_HARD_ADDRESS			nlattr[BATADV_ATTR_HARD_ADDRESS, array[int8, 6]]
 	BATADV_ATTR_ORIG_ADDRESS			nlattr[BATADV_ATTR_ORIG_ADDRESS, array[int8, 6]]
 	BATADV_ATTR_TPMETER_RESULT			nlattr[BATADV_ATTR_TPMETER_RESULT, int8]
@@ -2172,8 +2172,8 @@ hwsim_tx_rate$auto_record {
 } [packed]
 
 ieee802154_policy$auto_nl802154 [
-	IEEE802154_ATTR_DEV_NAME			nlattr[IEEE802154_ATTR_DEV_NAME, stringnoz]
-	IEEE802154_ATTR_DEV_INDEX			nlattr[IEEE802154_ATTR_DEV_INDEX, int32]
+	IEEE802154_ATTR_DEV_NAME			nlattr[IEEE802154_ATTR_DEV_NAME, devname]
+	IEEE802154_ATTR_DEV_INDEX			nlattr[IEEE802154_ATTR_DEV_INDEX, ifindex]
 	IEEE802154_ATTR_STATUS				nlattr[IEEE802154_ATTR_STATUS, int8]
 	IEEE802154_ATTR_SHORT_ADDR			nlattr[IEEE802154_ATTR_SHORT_ADDR, int16]
 	IEEE802154_ATTR_HW_ADDR				nlattr[IEEE802154_ATTR_HW_ADDR, int64]
@@ -2325,7 +2325,7 @@ iocb$auto_record {
 	aio_rw_flags	int32
 	aio_lio_opcode	int16
 	aio_reqprio	int16
-	aio_fildes	int32
+	aio_fildes	fd
 	aio_buf		int64
 	aio_nbytes	int64
 	aio_offset	int64
@@ -3429,7 +3429,7 @@ sysinfo$auto_record {
 
 taskstats_cmd_get_policy$auto_taskstats [
 	TASKSTATS_CMD_ATTR_PID			nlattr[TASKSTATS_CMD_ATTR_PID, pid]
-	TASKSTATS_CMD_ATTR_TGID			nlattr[TASKSTATS_CMD_ATTR_TGID, int32]
+	TASKSTATS_CMD_ATTR_TGID			nlattr[TASKSTATS_CMD_ATTR_TGID, pid]
 	TASKSTATS_CMD_ATTR_REGISTER_CPUMASK	nlattr[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK, stringnoz]
 	TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK	nlattr[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK, stringnoz]
 ] [varlen]
@@ -3459,7 +3459,7 @@ thermal_genl_policy$auto_thermal_netlink [
 	THERMAL_GENL_ATTR_CDEV_ID			nlattr[THERMAL_GENL_ATTR_CDEV_ID, int32]
 	THERMAL_GENL_ATTR_CDEV_CUR_STATE		nlattr[THERMAL_GENL_ATTR_CDEV_CUR_STATE, int32]
 	THERMAL_GENL_ATTR_CDEV_MAX_STATE		nlattr[THERMAL_GENL_ATTR_CDEV_MAX_STATE, int32]
-	THERMAL_GENL_ATTR_CDEV_NAME			nlattr[THERMAL_GENL_ATTR_CDEV_NAME, stringnoz]
+	THERMAL_GENL_ATTR_CDEV_NAME			nlattr[THERMAL_GENL_ATTR_CDEV_NAME, devname]
 	THERMAL_GENL_ATTR_CPU_CAPABILITY		nlattr[THERMAL_GENL_ATTR_CPU_CAPABILITY, array[int8]]
 	THERMAL_GENL_ATTR_CPU_CAPABILITY_ID		nlattr[THERMAL_GENL_ATTR_CPU_CAPABILITY_ID, int32]
 	THERMAL_GENL_ATTR_CPU_CAPABILITY_PERFORMANCE	nlattr[THERMAL_GENL_ATTR_CPU_CAPABILITY_PERFORMANCE, int32]
@@ -3528,8 +3528,8 @@ utimbuf$auto_record {
 
 vdpa_nl_policy$auto_vdpa [
 	VDPA_ATTR_MGMTDEV_BUS_NAME	nlattr[VDPA_ATTR_MGMTDEV_BUS_NAME, string]
-	VDPA_ATTR_MGMTDEV_DEV_NAME	nlattr[VDPA_ATTR_MGMTDEV_DEV_NAME, stringnoz]
-	VDPA_ATTR_DEV_NAME		nlattr[VDPA_ATTR_DEV_NAME, stringnoz]
+	VDPA_ATTR_MGMTDEV_DEV_NAME	nlattr[VDPA_ATTR_MGMTDEV_DEV_NAME, devname]
+	VDPA_ATTR_DEV_NAME		nlattr[VDPA_ATTR_DEV_NAME, devname]
 	VDPA_ATTR_DEV_NET_CFG_MACADDR	nlattr[VDPA_ATTR_DEV_NET_CFG_MACADDR, array[int8]]
 	VDPA_ATTR_DEV_NET_CFG_MAX_VQP	nlattr[VDPA_ATTR_DEV_NET_CFG_MAX_VQP, int16]
 	VDPA_ATTR_DEV_NET_CFG_MTU	nlattr[VDPA_ATTR_DEV_NET_CFG_MTU, int16]