Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Add sc_pid to sockcred so that SOCK_DGRAM and LOCAL_CREDS so...
details: https://anonhg.NetBSD.org/src/rev/e949510c33ba
branches: trunk
changeset: 344606:e949510c33ba
user: roy <roy%NetBSD.org@localhost>
date: Wed Apr 06 19:45:45 2016 +0000
description:
Add sc_pid to sockcred so that SOCK_DGRAM and LOCAL_CREDS socket option
can learn the process id of the AF_LOCAL sender.
Add compat glue for old structure.
diffstat:
share/man/man4/unix.4 | 10 ++++-
sys/compat/common/Makefile | 5 ++-
sys/compat/common/uipc_usrreq_70.c | 70 ++++++++++++++++++++++++++++++++++++++
sys/compat/sys/socket.h | 24 ++++++++++++-
sys/kern/uipc_usrreq.c | 39 +++++++++++++++++++-
sys/modules/compat/Makefile | 3 +-
sys/sys/socket.h | 13 +++++-
sys/sys/un.h | 5 +-
sys/sys/unpcb.h | 5 +-
9 files changed, 159 insertions(+), 15 deletions(-)
diffs (truncated from 392 to 300 lines):
diff -r 3891ff168ce3 -r e949510c33ba share/man/man4/unix.4
--- a/share/man/man4/unix.4 Wed Apr 06 18:04:58 2016 +0000
+++ b/share/man/man4/unix.4 Wed Apr 06 19:45:45 2016 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: unix.4,v 1.24 2011/05/29 08:46:42 wiz Exp $
+.\" $NetBSD: unix.4,v 1.25 2016/04/06 19:45:46 roy Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)unix.4 8.1 (Berkeley) 6/9/93
.\"
-.Dd May 29, 2011
+.Dd March 31, 2016
.Dt UNIX 4
.Os
.Sh NAME
@@ -198,6 +198,7 @@
as follows:
.Bd -literal
struct sockcred {
+ pid_t sc_pid; /* process id */
uid_t sc_uid; /* real user id */
uid_t sc_euid; /* effective user id */
gid_t sc_gid; /* real group id */
@@ -289,3 +290,8 @@
.%A Chris Torek
.Re
.Pq see Pa /usr/share/doc/psd/21.ipc
+.Sh HISTORY
+The
+.Ar sc_pid
+field was introduced in
+.Nx 8.0 .
diff -r 3891ff168ce3 -r e949510c33ba sys/compat/common/Makefile
--- a/sys/compat/common/Makefile Wed Apr 06 18:04:58 2016 +0000
+++ b/sys/compat/common/Makefile Wed Apr 06 19:45:45 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2016/03/22 08:25:23 mrg Exp $
+# $NetBSD: Makefile,v 1.56 2016/04/06 19:45:45 roy Exp $
LIB= compat
NOPIC= # defined
@@ -47,6 +47,9 @@
# Compatibility code for NetBSD 6.0
SRCS+= kern_sa_60.c tty_60.c kern_time_60.c
+# Compatibility code for NetBSD 7.0
+SRCS+= uipc_usrreq_70.c
+
# really, all machines where sizeof(int) != sizeof(long) (LP64)
.if (${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "sparc64" \
&& ${MACHINE_ARCH} != "x86_64")
diff -r 3891ff168ce3 -r e949510c33ba sys/compat/common/uipc_usrreq_70.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/compat/common/uipc_usrreq_70.c Wed Apr 06 19:45:45 2016 +0000
@@ -0,0 +1,70 @@
+/* $NetBSD: uipc_usrreq_70.c,v 1.1 2016/04/06 19:45:45 roy Exp $ */
+
+/*-
+ * Copyright (c) 2016 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Roy Marples.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``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 FOUNDATION OR CONTRIBUTORS
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq_70.c,v 1.1 2016/04/06 19:45:45 roy Exp $");
+
+#include <sys/param.h>
+#include <sys/lwp.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#include <sys/unpcb.h>
+#include <sys/mbuf.h>
+#include <sys/kauth.h>
+
+#include <compat/sys/socket.h>
+
+#ifdef COMPAT_SOCKCRED70
+struct mbuf *
+compat_70_unp_addsockcred(struct lwp *l, struct mbuf *control)
+{
+ struct sockcred70 *sc;
+ struct mbuf *m;
+ void *p;
+
+ m = sbcreatecontrol1(&p, SOCKCRED70SIZE(kauth_cred_ngroups(l->l_cred)),
+ SCM_OCREDS, SOL_SOCKET, M_WAITOK);
+ if (m == NULL)
+ return control;
+
+ sc = p;
+ sc->sc_uid = kauth_cred_getuid(l->l_cred);
+ sc->sc_euid = kauth_cred_geteuid(l->l_cred);
+ sc->sc_gid = kauth_cred_getgid(l->l_cred);
+ sc->sc_egid = kauth_cred_getegid(l->l_cred);
+ sc->sc_ngroups = kauth_cred_ngroups(l->l_cred);
+
+ for (int i = 0; i < sc->sc_ngroups; i++)
+ sc->sc_groups[i] = kauth_cred_group(l->l_cred, i);
+
+ return m_add(control, m);
+}
+#endif
diff -r 3891ff168ce3 -r e949510c33ba sys/compat/sys/socket.h
--- a/sys/compat/sys/socket.h Wed Apr 06 18:04:58 2016 +0000
+++ b/sys/compat/sys/socket.h Wed Apr 06 19:45:45 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: socket.h,v 1.12 2009/02/13 22:41:04 apb Exp $ */
+/* $NetBSD: socket.h,v 1.13 2016/04/06 19:45:45 roy Exp $ */
/*
* Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994
@@ -47,6 +47,10 @@
#define COMPAT_OSOCK
#endif
+#ifdef COMPAT_70
+#define COMPAT_SOCKCRED70
+#endif
+
#else
#define COMPAT_OSOCK
#endif
@@ -71,12 +75,28 @@
int msg_accrightslen;
};
+/*
+ * 7.0 compat sockcred
+ */
+struct sockcred70 {
+ uid_t sc_uid; /* real user id */
+ uid_t sc_euid; /* effective user id */
+ gid_t sc_gid; /* real group id */
+ gid_t sc_egid; /* effective group id */
+ int sc_ngroups; /* number of supplemental groups */
+ gid_t sc_groups[1]; /* variable length */
+};
+#define SOCKCRED70SIZE(ngrps) \
+ (/*CONSTCOND*/sizeof(struct sockcred70) + (sizeof(gid_t) * \
+ ((ngrps) ? ((ngrps) - 1) : 0)))
+
#ifdef _KERNEL
#define SO_OSNDTIMEO 0x1005
#define SO_ORCVTIMEO 0x1006
#define SO_OTIMESTAMP 0x0400
#define SCM_OTIMESTAMP 0x2
+#define SCM_OCREDS 0x4
__BEGIN_DECLS
struct socket;
@@ -84,6 +104,8 @@
u_long compat_cvtcmd(u_long cmd);
int compat_ifioctl(struct socket *, u_long, u_long, void *, struct lwp *);
int compat43_set_accrights(struct msghdr *, void *, int);
+
+struct mbuf * compat_70_unp_addsockcred(struct lwp *, struct mbuf *);
__END_DECLS
#else
int __socket30(int, int, int);
diff -r 3891ff168ce3 -r e949510c33ba sys/kern/uipc_usrreq.c
--- a/sys/kern/uipc_usrreq.c Wed Apr 06 18:04:58 2016 +0000
+++ b/sys/kern/uipc_usrreq.c Wed Apr 06 19:45:45 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_usrreq.c,v 1.179 2015/05/02 17:18:03 rtr Exp $ */
+/* $NetBSD: uipc_usrreq.c,v 1.180 2016/04/06 19:45:45 roy Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004, 2008, 2009 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.179 2015/05/02 17:18:03 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.180 2016/04/06 19:45:45 roy Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -120,6 +120,10 @@
#include <sys/kernel.h>
#include <sys/kthread.h>
+#ifdef COMPAT_70
+#include <compat/sys/socket.h>
+#endif
+
/*
* Unix communications domain.
*
@@ -319,6 +323,10 @@
sun = &sun_noname;
if (unp->unp_conn->unp_flags & UNP_WANTCRED)
control = unp_addsockcred(curlwp, control);
+#ifdef COMPAT_SOCKCRED70
+ if (unp->unp_conn->unp_flags & UNP_OWANTCRED)
+ control = compat_70_unp_addsockcred(curlwp, control);
+#endif
if (sbappendaddr(&so2->so_rcv, (const struct sockaddr *)sun, m,
control) == 0) {
so2->so_rcv.sb_overflowed++;
@@ -491,6 +499,16 @@
unp->unp_conn->unp_flags &= ~UNP_WANTCRED;
control = unp_addsockcred(l, control);
}
+#ifdef COMPAT_SOCKCRED70
+ if (unp->unp_conn->unp_flags & UNP_OWANTCRED) {
+ /*
+ * Credentials are passed only once on
+ * SOCK_STREAM and SOCK_SEQPACKET.
+ */
+ unp->unp_conn->unp_flags &= ~UNP_OWANTCRED;
+ control = compat_70_unp_addsockcred(l, control);
+ }
+#endif
/*
* Send to paired receive port, and then reduce
* send buffer hiwater marks to maintain backpressure.
@@ -566,6 +584,9 @@
switch (sopt->sopt_name) {
case LOCAL_CREDS:
case LOCAL_CONNWAIT:
+#ifdef COMPAT_SOCKCRED70
+ case LOCAL_OCREDS:
+#endif
error = sockopt_getint(sopt, &optval);
if (error)
break;
@@ -582,6 +603,11 @@
case LOCAL_CONNWAIT:
OPTSET(UNP_CONNWAIT);
break;
+#ifdef COMPAT_SOCKCRED70
+ case LOCAL_OCREDS:
+ OPTSET(UNP_OWANTCRED);
+ break;
+#endif
}
break;
#undef OPTSET
@@ -609,6 +635,12 @@
optval = OPTBIT(UNP_WANTCRED);
error = sockopt_setint(sopt, optval);
break;
+#ifdef COMPAT_SOCKCRED70
+ case LOCAL_OCREDS:
+ optval = OPTBIT(UNP_OWANTCRED);
+ error = sockopt_setint(sopt, optval);
+ break;
+#endif
#undef OPTBIT
default:
@@ -1572,8 +1604,9 @@
SCM_CREDS, SOL_SOCKET, M_WAITOK);
if (m == NULL)
return control;
-
+
sc = p;
+ sc->sc_pid = l->l_proc->p_pid;
sc->sc_uid = kauth_cred_getuid(l->l_cred);
sc->sc_euid = kauth_cred_geteuid(l->l_cred);
sc->sc_gid = kauth_cred_getgid(l->l_cred);
diff -r 3891ff168ce3 -r e949510c33ba sys/modules/compat/Makefile
--- a/sys/modules/compat/Makefile Wed Apr 06 18:04:58 2016 +0000
+++ b/sys/modules/compat/Makefile Wed Apr 06 19:45:45 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2015/05/10 07:41:16 pgoyette Exp $
+# $NetBSD: Makefile,v 1.13 2016/04/06 19:45:45 roy Exp $
.include "../Makefile.inc"
@@ -34,6 +34,7 @@
SRCS+= vfs_syscalls_43.c vm_12.c vm_43.c compat_mod.c
Home |
Main Index |
Thread Index |
Old Index