From 4f48184fb2c8948c406b21c3f802b5b281cef957 Mon Sep 17 00:00:00 2001 From: alfred Date: Fri, 13 Dec 2002 22:41:47 +0000 Subject: Backout removal SCARGS, the code freeze is only "selectively" over. --- sys/security/mac/mac_framework.c | 10 +++++----- sys/security/mac/mac_internal.h | 10 +++++----- sys/security/mac/mac_net.c | 10 +++++----- sys/security/mac/mac_pipe.c | 10 +++++----- sys/security/mac/mac_process.c | 10 +++++----- sys/security/mac/mac_syscalls.c | 10 +++++----- sys/security/mac/mac_system.c | 10 +++++----- sys/security/mac/mac_vfs.c | 10 +++++----- 8 files changed, 40 insertions(+), 40 deletions(-) (limited to 'sys/security') diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c index 6542a73..257d131 100644 --- a/sys/security/mac/mac_framework.c +++ b/sys/security/mac/mac_framework.c @@ -3020,7 +3020,7 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap) struct ucred *tcred; int error; - error = copyin(uap->mac_p, &mac, sizeof(mac)); + error = copyin(SCARG(uap, mac_p), &mac, sizeof(mac)); if (error) return (error); @@ -3203,7 +3203,7 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap) buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); mtx_lock(&Giant); /* VFS */ - error = fget(td, uap->fd, &fp); + error = fget(td, SCARG(uap, fd), &fp); if (error) goto out; @@ -3405,7 +3405,7 @@ __mac_set_fd(struct thread *td, struct __mac_set_fd_args *uap) mtx_lock(&Giant); /* VFS */ - error = fget(td, uap->fd, &fp); + error = fget(td, SCARG(uap, fd), &fp); if (error) goto out; @@ -3583,7 +3583,7 @@ mac_syscall(struct thread *td, struct mac_syscall_args *uap) char target[MAC_MAX_POLICY_NAME]; int error; - error = copyinstr(uap->policy, target, sizeof(target), NULL); + error = copyinstr(SCARG(uap, policy), target, sizeof(target), NULL); if (error) return (error); @@ -3593,7 +3593,7 @@ mac_syscall(struct thread *td, struct mac_syscall_args *uap) if (strcmp(mpc->mpc_name, target) == 0 && mpc->mpc_ops->mpo_syscall != NULL) { error = mpc->mpc_ops->mpo_syscall(td, - uap->call, uap->arg); + SCARG(uap, call), SCARG(uap, arg)); goto out; } } diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h index 6542a73..257d131 100644 --- a/sys/security/mac/mac_internal.h +++ b/sys/security/mac/mac_internal.h @@ -3020,7 +3020,7 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap) struct ucred *tcred; int error; - error = copyin(uap->mac_p, &mac, sizeof(mac)); + error = copyin(SCARG(uap, mac_p), &mac, sizeof(mac)); if (error) return (error); @@ -3203,7 +3203,7 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap) buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); mtx_lock(&Giant); /* VFS */ - error = fget(td, uap->fd, &fp); + error = fget(td, SCARG(uap, fd), &fp); if (error) goto out; @@ -3405,7 +3405,7 @@ __mac_set_fd(struct thread *td, struct __mac_set_fd_args *uap) mtx_lock(&Giant); /* VFS */ - error = fget(td, uap->fd, &fp); + error = fget(td, SCARG(uap, fd), &fp); if (error) goto out; @@ -3583,7 +3583,7 @@ mac_syscall(struct thread *td, struct mac_syscall_args *uap) char target[MAC_MAX_POLICY_NAME]; int error; - error = copyinstr(uap->policy, target, sizeof(target), NULL); + error = copyinstr(SCARG(uap, policy), target, sizeof(target), NULL); if (error) return (error); @@ -3593,7 +3593,7 @@ mac_syscall(struct thread *td, struct mac_syscall_args *uap) if (strcmp(mpc->mpc_name, target) == 0 && mpc->mpc_ops->mpo_syscall != NULL) { error = mpc->mpc_ops->mpo_syscall(td, - uap->call, uap->arg); + SCARG(uap, call), SCARG(uap, arg)); goto out; } } diff --git a/sys/security/mac/mac_net.c b/sys/security/mac/mac_net.c index 6542a73..257d131 100644 --- a/sys/security/mac/mac_net.c +++ b/sys/security/mac/mac_net.c @@ -3020,7 +3020,7 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap) struct ucred *tcred; int error; - error = copyin(uap->mac_p, &mac, sizeof(mac)); + error = copyin(SCARG(uap, mac_p), &mac, sizeof(mac)); if (error) return (error); @@ -3203,7 +3203,7 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap) buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); mtx_lock(&Giant); /* VFS */ - error = fget(td, uap->fd, &fp); + error = fget(td, SCARG(uap, fd), &fp); if (error) goto out; @@ -3405,7 +3405,7 @@ __mac_set_fd(struct thread *td, struct __mac_set_fd_args *uap) mtx_lock(&Giant); /* VFS */ - error = fget(td, uap->fd, &fp); + error = fget(td, SCARG(uap, fd), &fp); if (error) goto out; @@ -3583,7 +3583,7 @@ mac_syscall(struct thread *td, struct mac_syscall_args *uap) char target[MAC_MAX_POLICY_NAME]; int error; - error = copyinstr(uap->policy, target, sizeof(target), NULL); + error = copyinstr(SCARG(uap, policy), target, sizeof(target), NULL); if (error) return (error); @@ -3593,7 +3593,7 @@ mac_syscall(struct thread *td, struct mac_syscall_args *uap) if (strcmp(mpc->mpc_name, target) == 0 && mpc->mpc_ops->mpo_syscall != NULL) { error = mpc->mpc_ops->mpo_syscall(td, - uap->call, uap->arg); + SCARG(uap, call), SCARG(uap, arg)); goto out; } } diff --git a/sys/security/mac/mac_pipe.c b/sys/security/mac/mac_pipe.c index 6542a73..257d131 100644 --- a/sys/security/mac/mac_pipe.c +++ b/sys/security/mac/mac_pipe.c @@ -3020,7 +3020,7 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap) struct ucred *tcred; int error; - error = copyin(uap->mac_p, &mac, sizeof(mac)); + error = copyin(SCARG(uap, mac_p), &mac, sizeof(mac)); if (error) return (error); @@ -3203,7 +3203,7 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap) buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); mtx_lock(&Giant); /* VFS */ - error = fget(td, uap->fd, &fp); + error = fget(td, SCARG(uap, fd), &fp); if (error) goto out; @@ -3405,7 +3405,7 @@ __mac_set_fd(struct thread *td, struct __mac_set_fd_args *uap) mtx_lock(&Giant); /* VFS */ - error = fget(td, uap->fd, &fp); + error = fget(td, SCARG(uap, fd), &fp); if (error) goto out; @@ -3583,7 +3583,7 @@ mac_syscall(struct thread *td, struct mac_syscall_args *uap) char target[MAC_MAX_POLICY_NAME]; int error; - error = copyinstr(uap->policy, target, sizeof(target), NULL); + error = copyinstr(SCARG(uap, policy), target, sizeof(target), NULL); if (error) return (error); @@ -3593,7 +3593,7 @@ mac_syscall(struct thread *td, struct mac_syscall_args *uap) if (strcmp(mpc->mpc_name, target) == 0 && mpc->mpc_ops->mpo_syscall != NULL) { error = mpc->mpc_ops->mpo_syscall(td, - uap->call, uap->arg); + SCARG(uap, call), SCARG(uap, arg)); goto out; } } diff --git a/sys/security/mac/mac_process.c b/sys/security/mac/mac_process.c index 6542a73..257d131 100644 --- a/sys/security/mac/mac_process.c +++ b/sys/security/mac/mac_process.c @@ -3020,7 +3020,7 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap) struct ucred *tcred; int error; - error = copyin(uap->mac_p, &mac, sizeof(mac)); + error = copyin(SCARG(uap, mac_p), &mac, sizeof(mac)); if (error) return (error); @@ -3203,7 +3203,7 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap) buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); mtx_lock(&Giant); /* VFS */ - error = fget(td, uap->fd, &fp); + error = fget(td, SCARG(uap, fd), &fp); if (error) goto out; @@ -3405,7 +3405,7 @@ __mac_set_fd(struct thread *td, struct __mac_set_fd_args *uap) mtx_lock(&Giant); /* VFS */ - error = fget(td, uap->fd, &fp); + error = fget(td, SCARG(uap, fd), &fp); if (error) goto out; @@ -3583,7 +3583,7 @@ mac_syscall(struct thread *td, struct mac_syscall_args *uap) char target[MAC_MAX_POLICY_NAME]; int error; - error = copyinstr(uap->policy, target, sizeof(target), NULL); + error = copyinstr(SCARG(uap, policy), target, sizeof(target), NULL); if (error) return (error); @@ -3593,7 +3593,7 @@ mac_syscall(struct thread *td, struct mac_syscall_args *uap) if (strcmp(mpc->mpc_name, target) == 0 && mpc->mpc_ops->mpo_syscall != NULL) { error = mpc->mpc_ops->mpo_syscall(td, - uap->call, uap->arg); + SCARG(uap, call), SCARG(uap, arg)); goto out; } } diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c index 6542a73..257d131 100644 --- a/sys/security/mac/mac_syscalls.c +++ b/sys/security/mac/mac_syscalls.c @@ -3020,7 +3020,7 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap) struct ucred *tcred; int error; - error = copyin(uap->mac_p, &mac, sizeof(mac)); + error = copyin(SCARG(uap, mac_p), &mac, sizeof(mac)); if (error) return (error); @@ -3203,7 +3203,7 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap) buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); mtx_lock(&Giant); /* VFS */ - error = fget(td, uap->fd, &fp); + error = fget(td, SCARG(uap, fd), &fp); if (error) goto out; @@ -3405,7 +3405,7 @@ __mac_set_fd(struct thread *td, struct __mac_set_fd_args *uap) mtx_lock(&Giant); /* VFS */ - error = fget(td, uap->fd, &fp); + error = fget(td, SCARG(uap, fd), &fp); if (error) goto out; @@ -3583,7 +3583,7 @@ mac_syscall(struct thread *td, struct mac_syscall_args *uap) char target[MAC_MAX_POLICY_NAME]; int error; - error = copyinstr(uap->policy, target, sizeof(target), NULL); + error = copyinstr(SCARG(uap, policy), target, sizeof(target), NULL); if (error) return (error); @@ -3593,7 +3593,7 @@ mac_syscall(struct thread *td, struct mac_syscall_args *uap) if (strcmp(mpc->mpc_name, target) == 0 && mpc->mpc_ops->mpo_syscall != NULL) { error = mpc->mpc_ops->mpo_syscall(td, - uap->call, uap->arg); + SCARG(uap, call), SCARG(uap, arg)); goto out; } } diff --git a/sys/security/mac/mac_system.c b/sys/security/mac/mac_system.c index 6542a73..257d131 100644 --- a/sys/security/mac/mac_system.c +++ b/sys/security/mac/mac_system.c @@ -3020,7 +3020,7 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap) struct ucred *tcred; int error; - error = copyin(uap->mac_p, &mac, sizeof(mac)); + error = copyin(SCARG(uap, mac_p), &mac, sizeof(mac)); if (error) return (error); @@ -3203,7 +3203,7 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap) buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); mtx_lock(&Giant); /* VFS */ - error = fget(td, uap->fd, &fp); + error = fget(td, SCARG(uap, fd), &fp); if (error) goto out; @@ -3405,7 +3405,7 @@ __mac_set_fd(struct thread *td, struct __mac_set_fd_args *uap) mtx_lock(&Giant); /* VFS */ - error = fget(td, uap->fd, &fp); + error = fget(td, SCARG(uap, fd), &fp); if (error) goto out; @@ -3583,7 +3583,7 @@ mac_syscall(struct thread *td, struct mac_syscall_args *uap) char target[MAC_MAX_POLICY_NAME]; int error; - error = copyinstr(uap->policy, target, sizeof(target), NULL); + error = copyinstr(SCARG(uap, policy), target, sizeof(target), NULL); if (error) return (error); @@ -3593,7 +3593,7 @@ mac_syscall(struct thread *td, struct mac_syscall_args *uap) if (strcmp(mpc->mpc_name, target) == 0 && mpc->mpc_ops->mpo_syscall != NULL) { error = mpc->mpc_ops->mpo_syscall(td, - uap->call, uap->arg); + SCARG(uap, call), SCARG(uap, arg)); goto out; } } diff --git a/sys/security/mac/mac_vfs.c b/sys/security/mac/mac_vfs.c index 6542a73..257d131 100644 --- a/sys/security/mac/mac_vfs.c +++ b/sys/security/mac/mac_vfs.c @@ -3020,7 +3020,7 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap) struct ucred *tcred; int error; - error = copyin(uap->mac_p, &mac, sizeof(mac)); + error = copyin(SCARG(uap, mac_p), &mac, sizeof(mac)); if (error) return (error); @@ -3203,7 +3203,7 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap) buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); mtx_lock(&Giant); /* VFS */ - error = fget(td, uap->fd, &fp); + error = fget(td, SCARG(uap, fd), &fp); if (error) goto out; @@ -3405,7 +3405,7 @@ __mac_set_fd(struct thread *td, struct __mac_set_fd_args *uap) mtx_lock(&Giant); /* VFS */ - error = fget(td, uap->fd, &fp); + error = fget(td, SCARG(uap, fd), &fp); if (error) goto out; @@ -3583,7 +3583,7 @@ mac_syscall(struct thread *td, struct mac_syscall_args *uap) char target[MAC_MAX_POLICY_NAME]; int error; - error = copyinstr(uap->policy, target, sizeof(target), NULL); + error = copyinstr(SCARG(uap, policy), target, sizeof(target), NULL); if (error) return (error); @@ -3593,7 +3593,7 @@ mac_syscall(struct thread *td, struct mac_syscall_args *uap) if (strcmp(mpc->mpc_name, target) == 0 && mpc->mpc_ops->mpo_syscall != NULL) { error = mpc->mpc_ops->mpo_syscall(td, - uap->call, uap->arg); + SCARG(uap, call), SCARG(uap, arg)); goto out; } } -- cgit v1.1