aboutsummaryrefslogtreecommitdiff
path: root/sys/kern/sys_socket.c
diff options
context:
space:
mode:
authorRobert Watson <rwatson@FreeBSD.org>2002-08-17 02:36:16 +0000
committerRobert Watson <rwatson@FreeBSD.org>2002-08-17 02:36:16 +0000
commitd49fa1ca6ed75bd712b6eecb7383e9abe8b96943 (patch)
treefe31f7ea9a8713005d8ba378b027671dbea5c058 /sys/kern/sys_socket.c
parentc068736a6139e9a60b6b4747f762a572e1b002f4 (diff)
downloadsrc-d49fa1ca6ed75bd712b6eecb7383e9abe8b96943.tar.gz
src-d49fa1ca6ed75bd712b6eecb7383e9abe8b96943.zip
In continuation of early fileop credential changes, modify fo_ioctl() to
accept an 'active_cred' argument reflecting the credential of the thread initiating the ioctl operation. - Change fo_ioctl() to accept active_cred; change consumers of the fo_ioctl() interface to generally pass active_cred from td->td_ucred. - In fifofs, initialize filetmp.f_cred to ap->a_cred so that the invocations of soo_ioctl() are provided access to the calling f_cred. Pass ap->a_td->td_ucred as the active_cred, but note that this is required because we don't yet distinguish file_cred and active_cred in invoking VOP's. - Update kqueue_ioctl() for its new argument. - Update pipe_ioctl() for its new argument, pass active_cred rather than td_ucred to MAC for authorization. - Update soo_ioctl() for its new argument. - Update vn_ioctl() for its new argument, use active_cred rather than td->td_ucred to authorize VOP_IOCTL() and the associated VOP_GETATTR(). Obtained from: TrustedBSD Project Sponsored by: DARPA, NAI Labs
Notes
Notes: svn path=/head/; revision=102003
Diffstat (limited to 'sys/kern/sys_socket.c')
-rw-r--r--sys/kern/sys_socket.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c
index 53ca5b911e39..b4a9442c697b 100644
--- a/sys/kern/sys_socket.c
+++ b/sys/kern/sys_socket.c
@@ -93,10 +93,11 @@ soo_write(fp, uio, active_cred, flags, td)
}
int
-soo_ioctl(fp, cmd, data, td)
+soo_ioctl(fp, cmd, data, active_cred, td)
struct file *fp;
u_long cmd;
void *data;
+ struct ucred *active_cred;
struct thread *td;
{
register struct socket *so = (struct socket *)fp->f_data;