[src/trunk]: src/sys new message to track uid/gid changes

[provos <provos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/72ce06a06b9c
branches:  trunk
changeset: 537927:72ce06a06b9c
user:      provos <provos%NetBSD.org@localhost>
date:      Tue Oct 08 14:46:24 2002 +0000

description:
new message to track uid/gid changes

diffstat:

 sys/kern/kern_systrace.c |  46 ++++++++++++++++++++++++++++++++++++++++------
 sys/sys/systrace.h       |   9 ++++++++-
 2 files changed, 48 insertions(+), 7 deletions(-)

diffs (134 lines):

diff -r 9df4ca38036c -r 72ce06a06b9c sys/kern/kern_systrace.c
--- a/sys/kern/kern_systrace.c  Tue Oct 08 14:18:17 2002 +0000
+++ b/sys/kern/kern_systrace.c  Tue Oct 08 14:46:24 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_systrace.c,v 1.16 2002/09/06 13:18:43 gehenna Exp $       */
+/*     $NetBSD: kern_systrace.c,v 1.17 2002/10/08 14:46:24 provos Exp $        */
 
 /*
  * Copyright 2002 Niels Provos <provos%citi.umich.edu@localhost>
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_systrace.c,v 1.16 2002/09/06 13:18:43 gehenna Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_systrace.c,v 1.17 2002/10/08 14:46:24 provos Exp $");
 
 #include "opt_systrace.h"
 
@@ -117,6 +117,9 @@
 
        struct proc *proc;
        const struct emul *oldemul;
+       uid_t olduid;
+       gid_t oldgid;
+
        pid_t pid;
 
        struct fsystrace *parent;
@@ -159,6 +162,7 @@
 int    systrace_msg_result(struct fsystrace *, struct str_process *,
            int, int, size_t, register_t [], register_t []);
 int    systrace_msg_emul(struct fsystrace *, struct str_process *);
+int    systrace_msg_ugid(struct fsystrace *, struct str_process *);
 int    systrace_make_msg(struct str_process *, int);
 
 static struct fileops systracefops = {
@@ -760,12 +764,16 @@
                SYSTRACE_UNLOCK(fst, p);
        }
        if (strp != NULL) {
-               if (error == 0)
-                       strp->oldemul = p->p_emul;
-               else
+               if (error) {
                        strp->oldemul = NULL;
+                       return (error);
+               }
+
+               strp->oldemul = p->p_emul;
+               strp->olduid = p->p_cred->p_ruid;
+               strp->oldgid = p->p_cred->p_rgid;
        }
-       return error;
+       return (error);
 }
 
 void
@@ -812,6 +820,20 @@
        } else
                systrace_unlock();
 
+       /* Report if effective uid or gid changed */
+       systrace_lock();
+       strp = p->p_systrace;
+       if (strp != NULL && (strp->olduid != p->p_cred->p_ruid ||
+           strp->oldgid != p->p_cred->p_rgid)) {
+
+               fst = strp->parent;
+               SYSTRACE_LOCK(fst, p);
+               systrace_unlock();
+
+               systrace_msg_ugid(fst, strp);
+       } else
+               systrace_unlock();
+
        /* Report result from system call */
        systrace_lock();
        strp = p->p_systrace;
@@ -1409,6 +1431,18 @@
 }
 
 int
+systrace_msg_ugid(struct fsystrace *fst, struct str_process *strp)
+{
+       struct str_msg_ugid *msg_ugid = &strp->msg.msg_data.msg_ugid;
+       struct proc *p = strp->proc;
+
+       msg_ugid->uid = p->p_cred->p_ruid;
+       msg_ugid->gid = p->p_cred->p_rgid;
+
+       return (systrace_make_msg(strp, SYSTR_MSG_UGID));
+}
+
+int
 systrace_make_msg(struct str_process *strp, int type)
 {
        struct str_message *msg = &strp->msg;
diff -r 9df4ca38036c -r 72ce06a06b9c sys/sys/systrace.h
--- a/sys/sys/systrace.h        Tue Oct 08 14:18:17 2002 +0000
+++ b/sys/sys/systrace.h        Tue Oct 08 14:46:24 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: systrace.h,v 1.4 2002/10/05 08:00:52 tsutsui Exp $     */
+/*     $NetBSD: systrace.h,v 1.5 2002/10/08 14:46:25 provos Exp $      */
 
 /*
  * Copyright 2002 Niels Provos <provos%citi.umich.edu@localhost>
@@ -43,6 +43,11 @@
        char emul[SYSTR_EMULEN];
 };
 
+struct str_msg_ugid {
+       uid_t uid;
+       gid_t gid;
+};
+
 #define SYSTR_MAX_POLICIES     64
 #define SYSTR_MAXARGS          64
 
@@ -64,6 +69,7 @@
 #define SYSTR_MSG_RES  2
 #define SYSTR_MSG_EMUL 3
 #define SYSTR_MSG_CHILD        4
+#define SYSTR_MSG_UGID 5
 
 #define SYSTR_MSG_NOPROCESS(x) \
        ((x)->msg.msg_type == SYSTR_MSG_CHILD)
@@ -75,6 +81,7 @@
        int16_t msg_policy;
        union {
                struct str_msg_emul msg_emul;
+               struct str_msg_ugid msg_ugid;
                struct str_msg_ask msg_ask;
                struct str_msg_child msg_child;
        } msg_data;