Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/compat/osf1 protection-related bits -> osf1_prot.c
details: https://anonhg.NetBSD.org/src/rev/721e79375605
branches: trunk
changeset: 472534:721e79375605
user: cgd <cgd%NetBSD.org@localhost>
date: Sat May 01 05:49:01 1999 +0000
description:
protection-related bits -> osf1_prot.c
diffstat:
sys/compat/osf1/files.osf1 | 3 +-
sys/compat/osf1/osf1_misc.c | 75 +-----------------------
sys/compat/osf1/osf1_prot.c | 141 ++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 144 insertions(+), 75 deletions(-)
diffs (251 lines):
diff -r 0214a699c169 -r 721e79375605 sys/compat/osf1/files.osf1
--- a/sys/compat/osf1/files.osf1 Sat May 01 05:43:52 1999 +0000
+++ b/sys/compat/osf1/files.osf1 Sat May 01 05:49:01 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.osf1,v 1.14 1999/05/01 05:43:52 cgd Exp $
+# $NetBSD: files.osf1,v 1.15 1999/05/01 05:49:01 cgd Exp $
#
# Config file description for machine-independent OSF/1 compat code.
# Included by ports that need it.
@@ -26,6 +26,7 @@
file compat/osf1/osf1_misc.c compat_osf1
file compat/osf1/osf1_mmap.c compat_osf1
file compat/osf1/osf1_mount.c compat_osf1
+file compat/osf1/osf1_prot.c compat_osf1
file compat/osf1/osf1_resource.c compat_osf1
file compat/osf1/osf1_signal.c compat_osf1
file compat/osf1/osf1_socket.c compat_osf1
diff -r 0214a699c169 -r 721e79375605 sys/compat/osf1/osf1_misc.c
--- a/sys/compat/osf1/osf1_misc.c Sat May 01 05:43:52 1999 +0000
+++ b/sys/compat/osf1/osf1_misc.c Sat May 01 05:49:01 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: osf1_misc.c,v 1.47 1999/05/01 05:41:56 cgd Exp $ */
+/* $NetBSD: osf1_misc.c,v 1.48 1999/05/01 05:49:02 cgd Exp $ */
/*
* Copyright (c) 1999 Christopher G. Demetriou. All rights reserved.
@@ -162,79 +162,6 @@
return sys_reboot(p, &a, retval);
}
-/*
- * OSF/1 defines _POSIX_SAVED_IDS, which means that our normal
- * setuid() won't work.
- *
- * Instead, by P1003.1b-1993, setuid() is supposed to work like:
- * If the process has appropriate [super-user] priviledges, the
- * setuid() function sets the real user ID, effective user
- * ID, and the saved set-user-ID to uid.
- * If the process does not have appropriate priviledges, but uid
- * is equal to the real user ID or the saved set-user-ID, the
- * setuid() function sets the effective user ID to uid; the
- * real user ID and saved set-user-ID remain unchanged by
- * this function call.
- */
-int
-osf1_sys_setuid(p, v, retval)
- struct proc *p;
- void *v;
- register_t *retval;
-{
- struct osf1_sys_setuid_args *uap = v;
- struct pcred *pc = p->p_cred;
- uid_t uid = SCARG(uap, uid);
- int error;
-
- if ((error = suser(pc->pc_ucred, &p->p_acflag)) != 0 &&
- uid != pc->p_ruid && uid != pc->p_svuid)
- return (error);
-
- pc->pc_ucred = crcopy(pc->pc_ucred);
- pc->pc_ucred->cr_uid = uid;
- if (error == 0) {
- (void)chgproccnt(pc->p_ruid, -1);
- (void)chgproccnt(uid, 1);
- pc->p_ruid = uid;
- pc->p_svuid = uid;
- }
- p->p_flag |= P_SUGID;
- return (0);
-}
-
-/*
- * OSF/1 defines _POSIX_SAVED_IDS, which means that our normal
- * setgid() won't work.
- *
- * If you change "uid" to "gid" in the discussion, above, about
- * setuid(), you'll get a correct description of setgid().
- */
-int
-osf1_sys_setgid(p, v, retval)
- struct proc *p;
- void *v;
- register_t *retval;
-{
- struct osf1_sys_setgid_args *uap = v;
- struct pcred *pc = p->p_cred;
- gid_t gid = SCARG(uap, gid);
- int error;
-
- if ((error = suser(pc->pc_ucred, &p->p_acflag)) != 0 &&
- gid != pc->p_rgid && gid != pc->p_svgid)
- return (error);
-
- pc->pc_ucred = crcopy(pc->pc_ucred);
- pc->pc_ucred->cr_gid = gid;
- if (error == 0) {
- pc->p_rgid = gid;
- pc->p_svgid = gid;
- }
- p->p_flag |= P_SUGID;
- return (0);
-}
-
int
osf1_sys_uname(p, v, retval)
struct proc *p;
diff -r 0214a699c169 -r 721e79375605 sys/compat/osf1/osf1_prot.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/compat/osf1/osf1_prot.c Sat May 01 05:49:01 1999 +0000
@@ -0,0 +1,141 @@
+/* $NetBSD: osf1_prot.c,v 1.1 1999/05/01 05:49:02 cgd Exp $ */
+
+/*
+ * Copyright (c) 1999 Christopher G. Demetriou. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by Christopher G. Demetriou
+ * for the NetBSD Project.
+ * 4. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Copyright (c) 1994, 1995 Carnegie-Mellon University.
+ * All rights reserved.
+ *
+ * Author: Chris G. Demetriou
+ *
+ * Permission to use, copy, modify and distribute this software and
+ * its documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ *
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
+ * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * Carnegie Mellon requests users of this software to return to
+ *
+ * Software Distribution Coordinator or Software.Distribution%CS.CMU.EDU@localhost
+ * School of Computer Science
+ * Carnegie Mellon University
+ * Pittsburgh PA 15213-3890
+ *
+ * any improvements or extensions that they make and grant Carnegie the
+ * rights to redistribute these changes.
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/mount.h>
+#include <sys/syscallargs.h>
+
+#include <compat/osf1/osf1.h>
+#include <compat/osf1/osf1_syscallargs.h>
+#include <compat/osf1/osf1_cvt.h>
+
+/*
+ * OSF/1 defines _POSIX_SAVED_IDS, which means that our normal
+ * setuid() won't work.
+ *
+ * Instead, by P1003.1b-1993, setuid() is supposed to work like:
+ * If the process has appropriate [super-user] priviledges, the
+ * setuid() function sets the real user ID, effective user
+ * ID, and the saved set-user-ID to uid.
+ * If the process does not have appropriate priviledges, but uid
+ * is equal to the real user ID or the saved set-user-ID, the
+ * setuid() function sets the effective user ID to uid; the
+ * real user ID and saved set-user-ID remain unchanged by
+ * this function call.
+ */
+int
+osf1_sys_setuid(p, v, retval)
+ struct proc *p;
+ void *v;
+ register_t *retval;
+{
+ struct osf1_sys_setuid_args *uap = v;
+ struct pcred *pc = p->p_cred;
+ uid_t uid = SCARG(uap, uid);
+ int error;
+
+ if ((error = suser(pc->pc_ucred, &p->p_acflag)) != 0 &&
+ uid != pc->p_ruid && uid != pc->p_svuid)
+ return (error);
+
+ pc->pc_ucred = crcopy(pc->pc_ucred);
+ pc->pc_ucred->cr_uid = uid;
+ if (error == 0) {
+ (void)chgproccnt(pc->p_ruid, -1);
+ (void)chgproccnt(uid, 1);
+ pc->p_ruid = uid;
+ pc->p_svuid = uid;
+ }
+ p->p_flag |= P_SUGID;
+ return (0);
+}
+
+/*
+ * OSF/1 defines _POSIX_SAVED_IDS, which means that our normal
+ * setgid() won't work.
+ *
+ * If you change "uid" to "gid" in the discussion, above, about
+ * setuid(), you'll get a correct description of setgid().
+ */
+int
+osf1_sys_setgid(p, v, retval)
+ struct proc *p;
+ void *v;
+ register_t *retval;
+{
+ struct osf1_sys_setgid_args *uap = v;
+ struct pcred *pc = p->p_cred;
+ gid_t gid = SCARG(uap, gid);
+ int error;
+
+ if ((error = suser(pc->pc_ucred, &p->p_acflag)) != 0 &&
+ gid != pc->p_rgid && gid != pc->p_svgid)
+ return (error);
+
+ pc->pc_ucred = crcopy(pc->pc_ucred);
+ pc->pc_ucred->cr_gid = gid;
+ if (error == 0) {
+ pc->p_rgid = gid;
+ pc->p_svgid = gid;
+ }
+ p->p_flag |= P_SUGID;
+ return (0);
+}
Home |
Main Index |
Thread Index |
Old Index