From 3246fbf45f089a96288563f2d5071bfbde5f99df Mon Sep 17 00:00:00 2001 From: rwatson Date: Sat, 17 Aug 2002 02:36:16 +0000 Subject: 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 --- sys/kern/sys_socket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sys/kern/sys_socket.c') diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index 53ca5b9..b4a9442 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; -- cgit v1.1