Complete LOCAL_PEERCRED support. Cache pid of the remote process in the

struct xucred. Do not bump XUCRED_VERSION as struct layout is not changed.

PR:		215202
Differential Revision:	https://reviews.freebsd.org/D20415

(cherry picked from commit c5afec6e895a11c64f58eb99e493adb8ad5dc361)

7 files changed, 22 insertions, 11 deletions

diff --git a/crypto/heimdal/lib/ipc/server.c b/crypto/heimdal/lib/ipc/server.c
index e4cb03ce2753..7b5b49ec019c 100644
--- a/crypto/heimdal/lib/ipc/server.c
+++ b/crypto/heimdal/lib/ipc/server.c
@@ -550,7 +550,7 @@ update_client_creds(struct client *c)
 	{
 	    c->unixrights.uid = peercred.cr_uid;
 	    c->unixrights.gid = peercred.cr_gid;
-	    c->unixrights.pid = 0;
+	    c->unixrights.pid = peercred.cr_pid;
 	    return 1;
 	}
     }
diff --git a/share/man/man4/unix.4 b/share/man/man4/unix.4
index ca7dc903f73e..569e6dd25208 100644
--- a/share/man/man4/unix.4
+++ b/share/man/man4/unix.4
@@ -312,6 +312,7 @@ struct xucred {
   uid_t	cr_uid;			/* effective user id */
   short	cr_ngroups;		/* number of groups */
   gid_t	cr_groups[XU_NGROUPS];	/* groups */
+  pid_t	cr_pid;			/* process id of the sending process */
 };
 .Ed
 The
diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c
index 3d0de9838339..6007d9dc726b 100644
--- a/sys/compat/linux/linux_socket.c
+++ b/sys/compat/linux/linux_socket.c
@@ -1538,10 +1538,7 @@ linux_getsockopt(struct thread *td, struct linux_getsockopt_args *args)
 			    name, &xu, UIO_SYSSPACE, &xulen);
 			if (error != 0)
 				return (error);
-			/*
-			 * XXX Use 0 for pid as the FreeBSD does not cache peer pid.
-			 */
-			lxu.pid = 0;
+			lxu.pid = xu.cr_pid;
 			lxu.uid = xu.cr_uid;
 			lxu.gid = xu.cr_gid;
 			return (copyout(&lxu, PTRIN(args->optval), sizeof(lxu)));
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c
index 0f4814c59e78..b276540ec8d5 100644
--- a/sys/kern/kern_prot.c
+++ b/sys/kern/kern_prot.c
@@ -1931,6 +1931,14 @@ cru2x(struct ucred *cr, struct xucred *xcr)
 	    ngroups * sizeof(*cr->cr_groups));
 }
 
+void inline
+cru2xt(struct thread *td, struct xucred *xcr)
+{
+
+	cru2x(td->td_ucred, xcr);
+	xcr->cr_pid = td->td_proc->p_pid;
+}
+
 /*
  * Set initial process credentials.
  * Callers are responsible for providing the reference for provided credentials.
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index ade65c01c471..25f27837d6d5 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -892,7 +892,7 @@ uipc_listen(struct socket *so, int backlog, struct thread *td)
 	SOCK_LOCK(so);
 	error = solisten_proto_check(so);
 	if (error == 0) {
-		cru2x(td->td_ucred, &unp->unp_peercred);
+		cru2xt(td, &unp->unp_peercred);
 		solisten_proto(so, backlog);
 	}
 	SOCK_UNLOCK(so);
@@ -1638,7 +1638,7 @@ void
 unp_copy_peercred(struct thread *td, struct unpcb *client_unp,
     struct unpcb *server_unp, struct unpcb *listen_unp)
 {
-	cru2x(td->td_ucred, &client_unp->unp_peercred);
+	cru2xt(td, &client_unp->unp_peercred);
 	client_unp->unp_flags |= UNP_HAVEPC;
 
 	memcpy(&server_unp->unp_peercred, &listen_unp->unp_peercred,
@@ -2812,8 +2812,8 @@ db_print_xucred(int indent, struct xucred *xu)
 	int comma, i;
 
 	db_print_indent(indent);
-	db_printf("cr_version: %u   cr_uid: %u   cr_ngroups: %d\n",
-	    xu->cr_version, xu->cr_uid, xu->cr_ngroups);
+	db_printf("cr_version: %u   cr_uid: %u   cr_pid: %d   cr_ngroups: %d\n",
+	    xu->cr_version, xu->cr_uid, xu->cr_pid, xu->cr_ngroups);
 	db_print_indent(indent);
 	db_printf("cr_groups: ");
 	comma = 0;
diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h
index e2e0c998bff8..f7079ad92c1c 100644
--- a/sys/sys/ucred.h
+++ b/sys/sys/ucred.h
@@ -87,10 +87,14 @@ struct xucred {
 	uid_t	cr_uid;			/* effective user id */
 	short	cr_ngroups;		/* number of groups */
 	gid_t	cr_groups[XU_NGROUPS];	/* groups */
-	void	*_cr_unused1;		/* compatibility with old ucred */
+	union {
+		void	*_cr_unused1;	/* compatibility with old ucred */
+		pid_t	_pid;
+	} _cr;
 };
 #define	XUCRED_VERSION	0
 
+#define	cr_pid _cr._pid
 /* This can be used for both ucred and xucred structures. */
 #define	cr_gid cr_groups[0]
 
@@ -114,6 +118,7 @@ void	crfree(struct ucred *cr);
 struct ucred	*crget(void);
 struct ucred	*crhold(struct ucred *cr);
 void	cru2x(struct ucred *cr, struct xucred *xcr);
+void	cru2xt(struct thread *td, struct xucred *xcr);
 void	crsetgroups(struct ucred *cr, int n, gid_t *groups);
 int	groupmember(gid_t gid, struct ucred *cred);
 #endif /* _KERNEL */
diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c
index 2ea9516246c0..2936a1962a33 100644
--- a/usr.sbin/mountd/mountd.c
+++ b/usr.sbin/mountd/mountd.c
@@ -273,7 +273,7 @@ static struct xucred def_anon = {
 	(uid_t)65534,
 	1,
 	{ (gid_t)65533 },
-	NULL
+	{ NULL }
 };
 static int force_v2 = 0;
 static int resvport_only = 1;