[src/netbsd-9]: src/sys/kern Pull up following revision(s) (requested by chri...

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

details:   https://anonhg.NetBSD.org/src/rev/ecc4ad741133
branches:  netbsd-9
changeset: 964130:ecc4ad741133
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Sep 22 18:39:01 2020 +0000

description:
Pull up following revision(s) (requested by christos in ticket #1091):

        sys/kern/uipc_socket.c: revision 1.291
        sys/kern/uipc_usrreq.c: revision 1.199
        sys/kern/uipc_socket2.c: revision 1.138

add socket info for user and group for unix sockets in fstat.

diffstat:

 sys/kern/uipc_socket.c  |  5 +++--
 sys/kern/uipc_socket2.c |  5 +++--
 sys/kern/uipc_usrreq.c  |  6 ++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diffs (79 lines):

diff -r 51df22d2f60e -r ecc4ad741133 sys/kern/uipc_socket.c
--- a/sys/kern/uipc_socket.c    Sun Sep 20 10:17:44 2020 +0000
+++ b/sys/kern/uipc_socket.c    Tue Sep 22 18:39:01 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_socket.c,v 1.281.2.2 2020/02/25 19:10:51 martin Exp $     */
+/*     $NetBSD: uipc_socket.c,v 1.281.2.3 2020/09/22 18:39:01 martin Exp $     */
 
 /*
  * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.281.2.2 2020/02/25 19:10:51 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.281.2.3 2020/09/22 18:39:01 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -526,6 +526,7 @@
 #endif
        uid = kauth_cred_geteuid(l->l_cred);
        so->so_uidinfo = uid_find(uid);
+       so->so_egid = kauth_cred_getegid(l->l_cred);
        so->so_cpid = l->l_proc->p_pid;
 
        /*
diff -r 51df22d2f60e -r ecc4ad741133 sys/kern/uipc_socket2.c
--- a/sys/kern/uipc_socket2.c   Sun Sep 20 10:17:44 2020 +0000
+++ b/sys/kern/uipc_socket2.c   Tue Sep 22 18:39:01 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_socket2.c,v 1.134 2019/07/11 17:30:44 maxv Exp $  */
+/*     $NetBSD: uipc_socket2.c,v 1.134.2.1 2020/09/22 18:39:01 martin Exp $    */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.134 2019/07/11 17:30:44 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.134.2.1 2020/09/22 18:39:01 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -317,6 +317,7 @@
        so->so_send = head->so_send;
        so->so_receive = head->so_receive;
        so->so_uidinfo = head->so_uidinfo;
+       so->so_egid = head->so_egid;
        so->so_cpid = head->so_cpid;
 
        /*
diff -r 51df22d2f60e -r ecc4ad741133 sys/kern/uipc_usrreq.c
--- a/sys/kern/uipc_usrreq.c    Sun Sep 20 10:17:44 2020 +0000
+++ b/sys/kern/uipc_usrreq.c    Tue Sep 22 18:39:01 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_usrreq.c,v 1.194 2019/07/29 09:42:17 maxv Exp $   */
+/*     $NetBSD: uipc_usrreq.c,v 1.194.2.1 2020/09/22 18:39:01 martin 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.194 2019/07/29 09:42:17 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.194.2.1 2020/09/22 18:39:01 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -898,6 +898,8 @@
                unp->unp_ino = unp_ino++;
        ub->st_atimespec = ub->st_mtimespec = ub->st_ctimespec = unp->unp_ctime;
        ub->st_ino = unp->unp_ino;
+       ub->st_uid = so->so_uidinfo->ui_uid;
+       ub->st_gid = so->so_egid;
        return (0);
 }