From owner-freebsd-stable@FreeBSD.ORG Sun Sep 27 19:24:50 2009 Return-Path: Delivered-To: stable@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E6982106566B; Sun, 27 Sep 2009 19:24:50 +0000 (UTC) (envelope-from des@des.no) Received: from tim.des.no (tim.des.no [194.63.250.121]) by mx1.freebsd.org (Postfix) with ESMTP id A2DC28FC19; Sun, 27 Sep 2009 19:24:50 +0000 (UTC) Received: from ds4.des.no (des.no [84.49.246.2]) by smtp.des.no (Postfix) with ESMTP id 2C7276D41B; Sun, 27 Sep 2009 19:06:28 +0000 (UTC) Received: by ds4.des.no (Postfix, from userid 1001) id BCBB58448F; Sun, 27 Sep 2009 21:06:27 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Jamie Gritton References: <4ABD4BB9.1030804@FreeBSD.org> Date: Sun, 27 Sep 2009 21:06:27 +0200 In-Reply-To: <4ABD4BB9.1030804@FreeBSD.org> (Jamie Gritton's message of "Fri, 25 Sep 2009 17:01:13 -0600") Message-ID: <86ab0g1a30.fsf@ds4.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.95 (berkeley-unix) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Cc: stable@FreeBSD.org, Marcel Moolenaar , "current@freebsd.org mailing list" Subject: Re: 8.0-RC1: kernel page fault in NLM master thread (VIMAGE or ZFS related?) X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Sep 2009 19:24:51 -0000 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Jamie Gritton writes: > Index: kern/vfs_export.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- kern/vfs_export.c (revision 197506) > +++ kern/vfs_export.c (working copy) > @@ -122,6 +122,8 @@ > np->netc_anon->cr_uid =3D argp->ex_anon.cr_uid; > crsetgroups(np->netc_anon, argp->ex_anon.cr_ngroups, > argp->ex_anon.cr_groups); > + np->netc_anon->cr_prison =3D &prison0; > + prison_hold(np->netc_anon->cr_prison); > np->netc_numsecflavors =3D argp->ex_numsecflavors; > bcopy(argp->ex_secflavors, np->netc_secflavors, > sizeof(np->netc_secflavors)); You need to #include for prison0... See attached patch. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=nfslockd.diff Index: sys/kern/vfs_export.c =================================================================== --- sys/kern/vfs_export.c (revision 197539) +++ sys/kern/vfs_export.c (working copy) @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -122,6 +123,8 @@ np->netc_anon->cr_uid = argp->ex_anon.cr_uid; crsetgroups(np->netc_anon, argp->ex_anon.cr_ngroups, argp->ex_anon.cr_groups); + np->netc_anon->cr_prison = &prison0; + prison_hold(np->netc_anon->cr_prison); np->netc_numsecflavors = argp->ex_numsecflavors; bcopy(argp->ex_secflavors, np->netc_secflavors, sizeof(np->netc_secflavors)); @@ -206,6 +209,8 @@ np->netc_anon->cr_uid = argp->ex_anon.cr_uid; crsetgroups(np->netc_anon, argp->ex_anon.cr_ngroups, np->netc_anon->cr_groups); + np->netc_anon->cr_prison = &prison0; + prison_hold(np->netc_anon->cr_prison); np->netc_numsecflavors = argp->ex_numsecflavors; bcopy(argp->ex_secflavors, np->netc_secflavors, sizeof(np->netc_secflavors)); Index: sys/rpc/rpcsec_gss/svc_rpcsec_gss.c =================================================================== --- sys/rpc/rpcsec_gss/svc_rpcsec_gss.c (revision 197539) +++ sys/rpc/rpcsec_gss/svc_rpcsec_gss.c (working copy) @@ -449,6 +449,8 @@ cr->cr_uid = cr->cr_ruid = cr->cr_svuid = uc->uid; cr->cr_rgid = cr->cr_svgid = uc->gid; crsetgroups(cr, uc->gidlen, uc->gidlist); + cr->cr_prison = &prison0; + prison_hold(cr->cr_prison); *crp = crhold(cr); return (TRUE); --=-=-=--