From owner-p4-projects Thu Sep 12 7:46:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B391637B41F; Thu, 12 Sep 2002 07:46:03 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EF13D37B417 for ; Thu, 12 Sep 2002 07:45:55 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A30B643E65 for ; Thu, 12 Sep 2002 07:45:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8CEjtJU065269 for ; Thu, 12 Sep 2002 07:45:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8CEjt8Z065266 for perforce@freebsd.org; Thu, 12 Sep 2002 07:45:55 -0700 (PDT) Date: Thu, 12 Sep 2002 07:45:55 -0700 (PDT) Message-Id: <200209121445.g8CEjt8Z065266@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17411 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17411 Change 17411 by rwatson@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@FreeBSD.org with "unsubscribe p4-projects" in the body of the message