PERFORCE change 17411 for review

[Robert Watson]

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17411

Change 17411 by rwatson at rwatson_sproing on 2002/09/12 07:45:04

	When an mbuf is generated on an NFS socket, we need to explicitly
	perform labeling on the mbuf in advance of the retransmission
	copy being made, or we panic in the label copy operation since
	MLS finds an uninitialized label.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/modules/nfsclient/Makefile#4 edit
.. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_socket.c#12 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/modules/nfsclient/Makefile#4 (text+ko) ====

@@ -5,7 +5,7 @@
 SRCS=	vnode_if.h \
 	nfs_bio.c nfs_lock.c nfs_node.c nfs_socket.c nfs_subs.c nfs_nfsiod.c \
 	nfs_vfsops.c nfs_vnops.c nfs_common.c \
-	opt_inet.h opt_nfs.h opt_bootp.h
+	opt_inet.h opt_mac.h opt_nfs.h opt_bootp.h
 SRCS+=	opt_inet6.h
 
 NFS_INET?=	1	# 0/1 - requires INET to be configured in kernel

==== //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_socket.c#12 (text+ko) ====

@@ -889,6 +889,10 @@
 	m = nfsm_rpchead(cred, nmp->nm_flag, procnum, auth_type, auth_len,
 	     mrest, mrest_len, &mheadend, &xid);
 
+#ifdef MAC
+	mac_create_mbuf_from_socket(nmp->nm_so, m);
+#endif
+
 	/*
 	 * For stream protocols, insert a Sun RPC Record Mark.
 	 */
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message