From 142a0957d03af017b31e76973bcfafaa098c2b5d Mon Sep 17 00:00:00 2001 From: Anton Lindqvist Date: Wed, 27 May 2020 19:57:58 +0200 Subject: sys/openbsd: change type of sysctl namelen argument The namelen argument must reflect the number of elements in the name vector. Since it's a vector of integers, bytesize4 seems more appropriate. With help from by Dmitry[1]. [1] https://github.com/google/syzkaller/pull/1761#discussion_r430139775 --- sys/openbsd/sysctl.txt | 52 +++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'sys') diff --git a/sys/openbsd/sysctl.txt b/sys/openbsd/sysctl.txt index 7e89faeb5..2b22dea2d 100644 --- a/sys/openbsd/sysctl.txt +++ b/sys/openbsd/sysctl.txt @@ -12,35 +12,35 @@ include # XXX can includes be made conditional based on the architecture? include -sysctl$ddb(name ptr[in, ctl_ddb], namelen len[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) -sysctl$fs(name ptr[in, ctl_fs], namelen len[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) -sysctl$hw(name ptr[in, ctl_hw], namelen len[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) -sysctl$kern(name ptr[in, ctl_kern], namelen len[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) -sysctl$machdep(name ptr[in, ctl_machdep], namelen len[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) +sysctl$ddb(name ptr[in, ctl_ddb], namelen bytesize4[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) +sysctl$fs(name ptr[in, ctl_fs], namelen bytesize4[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) +sysctl$hw(name ptr[in, ctl_hw], namelen bytesize4[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) +sysctl$kern(name ptr[in, ctl_kern], namelen bytesize4[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) +sysctl$machdep(name ptr[in, ctl_machdep], namelen bytesize4[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) # XXX sysctl$net_inet_route not supported? -sysctl$net_inet_ah(name ptr[in, ctl_net_inet_ah], namelen len[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) +sysctl$net_inet_ah(name ptr[in, ctl_net_inet_ah], namelen bytesize4[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) # XXX sysctl$net_inet_bpf not supported? -sysctl$net_inet_carp(name ptr[in, ctl_net_inet_carp], namelen len[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) -sysctl$net_inet_divert(name ptr[in, ctl_net_inet_divert], namelen len[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) -sysctl$net_inet_esp(name ptr[in, ctl_net_inet_esp], namelen len[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) -sysctl$net_inet_etherip(name ptr[in, ctl_net_inet_etherip], namelen len[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) -sysctl$net_inet_gre(name ptr[in, ctl_net_inet_gre], namelen len[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) -sysctl$net_inet_icmp(name ptr[in, ctl_net_inet_icmp], namelen len[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) -sysctl$net_inet_ip(name ptr[in, ctl_net_inet_ip], namelen len[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) -sysctl$net_inet_ipcomp(name ptr[in, ctl_net_inet_ipcomp], namelen len[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) -sysctl$net_inet_ipip(name ptr[in, ctl_net_inet_ipip], namelen len[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) -sysctl$net_inet_tcp(name ptr[in, ctl_net_inet_tcp], namelen len[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) -sysctl$net_inet_udp(name ptr[in, ctl_net_inet_udp], namelen len[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) -sysctl$net_inet6_icmp6(name ptr[in, ctl_net_inet6_icmp6], namelen len[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) -sysctl$net_inet6_ip6(name ptr[in, ctl_net_inet6_ip6], namelen len[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) +sysctl$net_inet_carp(name ptr[in, ctl_net_inet_carp], namelen bytesize4[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) +sysctl$net_inet_divert(name ptr[in, ctl_net_inet_divert], namelen bytesize4[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) +sysctl$net_inet_esp(name ptr[in, ctl_net_inet_esp], namelen bytesize4[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) +sysctl$net_inet_etherip(name ptr[in, ctl_net_inet_etherip], namelen bytesize4[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) +sysctl$net_inet_gre(name ptr[in, ctl_net_inet_gre], namelen bytesize4[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) +sysctl$net_inet_icmp(name ptr[in, ctl_net_inet_icmp], namelen bytesize4[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) +sysctl$net_inet_ip(name ptr[in, ctl_net_inet_ip], namelen bytesize4[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) +sysctl$net_inet_ipcomp(name ptr[in, ctl_net_inet_ipcomp], namelen bytesize4[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) +sysctl$net_inet_ipip(name ptr[in, ctl_net_inet_ipip], namelen bytesize4[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) +sysctl$net_inet_tcp(name ptr[in, ctl_net_inet_tcp], namelen bytesize4[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) +sysctl$net_inet_udp(name ptr[in, ctl_net_inet_udp], namelen bytesize4[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) +sysctl$net_inet6_icmp6(name ptr[in, ctl_net_inet6_icmp6], namelen bytesize4[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) +sysctl$net_inet6_ip6(name ptr[in, ctl_net_inet6_ip6], namelen bytesize4[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) # XXX sysctl$net_key not supported? -sysctl$net_mpls(name ptr[in, ctl_net_mpls], namelen len[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) -sysctl$net_pipex(name ptr[in, ctl_net_pipex], namelen len[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) -sysctl$vfs_ffs(name ptr[in, ctl_vfs_ffs], namelen len[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) -sysctl$vfs_nfs(name ptr[in, ctl_vfs_nfs], namelen len[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) -sysctl$vfs_fuse(name ptr[in, ctl_vfs_fuse], namelen len[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) -sysctl$vm(name ptr[in, ctl_vm], namelen len[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) -sysctl$vm_swapencrypt(name ptr[in, ctl_vm_swapencrypt], namelen len[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) +sysctl$net_mpls(name ptr[in, ctl_net_mpls], namelen bytesize4[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) +sysctl$net_pipex(name ptr[in, ctl_net_pipex], namelen bytesize4[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) +sysctl$vfs_ffs(name ptr[in, ctl_vfs_ffs], namelen bytesize4[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) +sysctl$vfs_nfs(name ptr[in, ctl_vfs_nfs], namelen bytesize4[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) +sysctl$vfs_fuse(name ptr[in, ctl_vfs_fuse], namelen bytesize4[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) +sysctl$vm(name ptr[in, ctl_vm], namelen bytesize4[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) +sysctl$vm_swapencrypt(name ptr[in, ctl_vm_swapencrypt], namelen bytesize4[name], oldp buffer[inout], oldlenp ptr[inout, len[oldp, int64]], newp buffer[in], newlen len[newp]) ctl_ddb { n1 const[CTL_DDB, int32] -- cgit mrf-deployment