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

1 files changed, 23 insertions, 12 deletions

diff --git a/sys/compat/svr4/svr4_ttold.c b/sys/compat/svr4/svr4_ttold.c
index 47a8135..7e4f234 100644
--- a/sys/compat/svr4/svr4_ttold.c
+++ b/sys/compat/svr4/svr4_ttold.c
@@ -192,8 +192,9 @@ svr4_ttold_ioctl(fp, td, retval, fd, cmd, data)
 		{
 			pid_t pid;
 
-			if ((error = fo_ioctl(fp, TIOCGPGRP, (caddr_t) &pid, td)) != 0)
-			    return error;
+			if ((error = fo_ioctl(fp, TIOCGPGRP, (caddr_t) &pid,
+			    td->td_ucred, td)) != 0)
+				return error;
 
 			DPRINTF(("TIOCGPGRP %d\n", pid));
 
@@ -211,14 +212,16 @@ svr4_ttold_ioctl(fp, td, retval, fd, cmd, data)
 
 			DPRINTF(("TIOCSPGRP %d\n", pid));
 
-			return fo_ioctl(fp, TIOCSPGRP, (caddr_t) &pid, td);
+			return fo_ioctl(fp, TIOCSPGRP, (caddr_t) &pid,
+			    td->td_ucred, td);
 		}
 
 	case SVR4_TIOCGSID:
 		{
 #if defined(TIOCGSID)
 			pid_t pid;
-			if ((error = fo_ioctl(fp, TIOCGSID, (caddr_t) &pid, td)) != 0)
+			if ((error = fo_ioctl(fp, TIOCGSID, (caddr_t) &pid,
+			    td->td_ucred, td)) != 0)
 				return error;
 
 			DPRINTF(("TIOCGSID %d\n", pid));
@@ -235,7 +238,8 @@ svr4_ttold_ioctl(fp, td, retval, fd, cmd, data)
 			struct sgttyb bs;
 			struct svr4_sgttyb ss;
 
-			error = fo_ioctl(fp, TIOCGETP, (caddr_t) &bs, td);
+			error = fo_ioctl(fp, TIOCGETP, (caddr_t) &bs,
+			    td->td_ucred, td);
 			if (error)
 				return error;
 
@@ -260,7 +264,8 @@ svr4_ttold_ioctl(fp, td, retval, fd, cmd, data)
 			print_svr4_sgttyb("SVR4_TIOCSET{P,N}", &ss);
 #endif /* DEBUG_SVR4 */
 			cmd = (cmd == SVR4_TIOCSETP) ? TIOCSETP : TIOCSETN;
-			return fo_ioctl(fp, cmd, (caddr_t) &bs, td);
+			return fo_ioctl(fp, cmd, (caddr_t) &bs,
+			    td->td_ucred, td);
 		}
 
 	case SVR4_TIOCGETC:
@@ -268,7 +273,8 @@ svr4_ttold_ioctl(fp, td, retval, fd, cmd, data)
 			struct tchars bt;
 			struct svr4_tchars st;
 
-			error = fo_ioctl(fp, TIOCGETC, (caddr_t) &bt, td);
+			error = fo_ioctl(fp, TIOCGETC, (caddr_t) &bt,
+			    td->td_ucred, td);
 			if (error)
 				return error;
 
@@ -291,7 +297,8 @@ svr4_ttold_ioctl(fp, td, retval, fd, cmd, data)
 #ifdef DEBUG_SVR4
 			print_svr4_tchars("SVR4_TIOCSETC", &st);
 #endif /* DEBUG_SVR4 */
-			return fo_ioctl(fp, TIOCSETC, (caddr_t) &bt, td);
+			return fo_ioctl(fp, TIOCSETC, (caddr_t) &bt,
+			    td->td_ucred, td);
 		}
 
 	case SVR4_TIOCGLTC:
@@ -299,7 +306,8 @@ svr4_ttold_ioctl(fp, td, retval, fd, cmd, data)
 			struct ltchars bl;
 			struct svr4_ltchars sl;
 
-			error = fo_ioctl(fp, TIOCGLTC, (caddr_t) &bl, td);
+			error = fo_ioctl(fp, TIOCGLTC, (caddr_t) &bl,
+			    td->td_ucred, td);
 			if (error)
 				return error;
 
@@ -322,13 +330,15 @@ svr4_ttold_ioctl(fp, td, retval, fd, cmd, data)
 #ifdef DEBUG_SVR4
 			print_svr4_ltchars("SVR4_TIOCSLTC", &sl);
 #endif /* DEBUG_SVR4 */
-			return fo_ioctl(fp, TIOCSLTC, (caddr_t) &bl, td);
+			return fo_ioctl(fp, TIOCSLTC, (caddr_t) &bl,
+			    td->td_ucred, td);
 		}
 
 	case SVR4_TIOCLGET:
 		{
 			int flags;
-			if ((error = fo_ioctl(fp, TIOCLGET, (caddr_t) &flags, td)) != 0)
+			if ((error = fo_ioctl(fp, TIOCLGET, (caddr_t) &flags,
+			    td->td_ucred, td)) != 0)
 				return error;
 			DPRINTF(("SVR4_TIOCLGET %o\n", flags));
 			return copyout(&flags, data, sizeof(flags));
@@ -356,7 +366,8 @@ svr4_ttold_ioctl(fp, td, retval, fd, cmd, data)
 			}
 
 			DPRINTF(("SVR4_TIOCL{SET,BIS,BIC} %o\n", flags));
-			return fo_ioctl(fp, cmd, (caddr_t) &flags, td);
+			return fo_ioctl(fp, cmd, (caddr_t) &flags,
+			    td->td_ucred, td);
 		}
 
 	default: