From 2385f4d1728b327172c3a4a944f984bd91625a6f Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Wed, 17 Nov 2021 20:12:22 +0000 Subject: syscalls: use __socklen_t as appropriate No functional change as __socklen_t is an int. Obtained from: CheriBSD Reviewed by: kevans --- sys/kern/syscalls.master | 22 +++++++++++----------- sys/kern/systrace_args.c | 28 ++++++++++++++-------------- 2 files changed, 25 insertions(+), 25 deletions(-) (limited to 'sys/kern') diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index a69b99cb0693..2ffefdef04a3 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -628,14 +628,14 @@ int connect( int s, _In_reads_bytes_(namelen) const struct sockaddr *name, - int namelen + __socklen_t namelen ); } 99 AUE_ACCEPT COMPAT|CAPENABLED { int accept( int s, _Out_writes_bytes_opt_(*anamelen) struct sockaddr *name, - int *anamelen + __socklen_t *anamelen ); } 100 AUE_GETPRIORITY STD|CAPENABLED { @@ -669,7 +669,7 @@ int bind( int s, _In_reads_bytes_(namelen) const struct sockaddr *name, - int namelen + __socklen_t namelen ); } 105 AUE_SETSOCKOPT STD|CAPENABLED { @@ -678,7 +678,7 @@ int level, int name, _In_reads_bytes_opt_(valsize) const void *val, - int valsize + __socklen_t valsize ); } 106 AUE_LISTEN STD|CAPENABLED { @@ -751,7 +751,7 @@ int level, int name, _Out_writes_bytes_opt_(*avalsize) void *val, - _Inout_ int *avalsize + _Inout_ __socklen_t *avalsize ); } 119 AUE_NULL RESERVED @@ -795,7 +795,7 @@ size_t len, int flags, _Out_writes_bytes_(*fromlenaddr) struct sockaddr *from, - _Inout_ int *fromlenaddr + _Inout_ __socklen_t *fromlenaddr ); } recvfrom recvfrom_args int 126 AUE_SETREUID STD|CAPENABLED { @@ -847,7 +847,7 @@ size_t len, int flags, _In_reads_bytes_opt_(tolen) const struct sockaddr *to, - int tolen + __socklen_t tolen ); } 134 AUE_SHUTDOWN STD|CAPENABLED { @@ -892,7 +892,7 @@ int getpeername( int fdes, _Out_writes_bytes_(*alen) struct sockaddr *asa, - _Inout_opt_ int *alen + _Inout_opt_ __socklen_t *alen ); } 142 AUE_SYSCTL COMPAT|CAPENABLED { @@ -939,7 +939,7 @@ int getsockname( int fdec, _Out_writes_bytes_(*alen) struct sockaddr *asa, - _Inout_ int *alen + _Inout_ __socklen_t *alen ); } getsockname getsockname_args int 151-153 AUE_NULL RESERVED @@ -2960,7 +2960,7 @@ int fd, int s, _In_reads_bytes_(namelen) const struct sockaddr *name, - int namelen + __socklen_t namelen ); } 539 AUE_CONNECTAT STD|CAPENABLED { @@ -2968,7 +2968,7 @@ int fd, int s, _In_reads_bytes_(namelen) const struct sockaddr *name, - int namelen + __socklen_t namelen ); } 540 AUE_CHFLAGSAT STD|CAPENABLED { diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index 55788649de4f..ab8e4d0d49d3 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -583,7 +583,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) struct connect_args *p = params; iarg[0] = p->s; /* int */ uarg[1] = (intptr_t)p->name; /* const struct sockaddr * */ - iarg[2] = p->namelen; /* int */ + iarg[2] = p->namelen; /* __socklen_t */ *n_args = 3; break; } @@ -600,7 +600,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) struct bind_args *p = params; iarg[0] = p->s; /* int */ uarg[1] = (intptr_t)p->name; /* const struct sockaddr * */ - iarg[2] = p->namelen; /* int */ + iarg[2] = p->namelen; /* __socklen_t */ *n_args = 3; break; } @@ -611,7 +611,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) iarg[1] = p->level; /* int */ iarg[2] = p->name; /* int */ uarg[3] = (intptr_t)p->val; /* const void * */ - iarg[4] = p->valsize; /* int */ + iarg[4] = p->valsize; /* __socklen_t */ *n_args = 5; break; } @@ -646,7 +646,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) iarg[1] = p->level; /* int */ iarg[2] = p->name; /* int */ uarg[3] = (intptr_t)p->val; /* void * */ - uarg[4] = (intptr_t)p->avalsize; /* int * */ + uarg[4] = (intptr_t)p->avalsize; /* __socklen_t * */ *n_args = 5; break; } @@ -741,7 +741,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) uarg[2] = p->len; /* size_t */ iarg[3] = p->flags; /* int */ uarg[4] = (intptr_t)p->to; /* const struct sockaddr * */ - iarg[5] = p->tolen; /* int */ + iarg[5] = p->tolen; /* __socklen_t */ *n_args = 6; break; } @@ -3032,7 +3032,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) iarg[0] = p->fd; /* int */ iarg[1] = p->s; /* int */ uarg[2] = (intptr_t)p->name; /* const struct sockaddr * */ - iarg[3] = p->namelen; /* int */ + iarg[3] = p->namelen; /* __socklen_t */ *n_args = 4; break; } @@ -3042,7 +3042,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) iarg[0] = p->fd; /* int */ iarg[1] = p->s; /* int */ uarg[2] = (intptr_t)p->name; /* const struct sockaddr * */ - iarg[3] = p->namelen; /* int */ + iarg[3] = p->namelen; /* __socklen_t */ *n_args = 4; break; } @@ -4321,7 +4321,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland const struct sockaddr *"; break; case 2: - p = "int"; + p = "__socklen_t"; break; default: break; @@ -4350,7 +4350,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland const struct sockaddr *"; break; case 2: - p = "int"; + p = "__socklen_t"; break; default: break; @@ -4372,7 +4372,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland const void *"; break; case 4: - p = "int"; + p = "__socklen_t"; break; default: break; @@ -4433,7 +4433,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland void *"; break; case 4: - p = "userland int *"; + p = "userland __socklen_t *"; break; default: break; @@ -4597,7 +4597,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland const struct sockaddr *"; break; case 5: - p = "int"; + p = "__socklen_t"; break; default: break; @@ -8438,7 +8438,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland const struct sockaddr *"; break; case 3: - p = "int"; + p = "__socklen_t"; break; default: break; @@ -8457,7 +8457,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland const struct sockaddr *"; break; case 3: - p = "int"; + p = "__socklen_t"; break; default: break; -- cgit v1.2.3