John wrote:
> After pondering the best way to allow the VOP_ACCESS() call to
> only query for the permissions really needed, I've come up with
> a patch that minimally adds one parameter to the nlm_get_vfs_state()
> function call with the lock type from the original argp.
>
> http://people.freebsd.org/~jwd/nlm_prot_impl.c.accmode.patch
>
> I'd appreciate a review and seeing what might be required to commit
> this prior to 9 release.
>
> Thanks,
> John
>
> ----- John's Original Message -----
> > Hi Fellow NFS'ers,
> >
> > I believe I have found the problem we've been having with read
> > locks
> > while attaching to a FreeBSD NFS server.
> >
> > In sys/nlm/nlm_prot_impl.c, function nlm_get_vfs_state(), there
> > is a call
> > to VOP_ACCESS() as follows:
> >
> > /*
> > * Check cred.
> > */
> > NLM_DEBUG(3, "nlm_get_vfs_state(): Calling
> > VOP_ACCESS(VWRITE) with cred->cr_uid=%d\n",cred->cr_uid);
> > error = VOP_ACCESS(vs->vs_vp, VWRITE, cred, curthread);
> > if (error) {
> > NLM_DEBUG(3, "nlm_get_vfs_state(): caller_name = %s
> > VOP_ACCESS() returns %d\n",
> > host->nh_caller_name, error);
> > goto out;
> > }
> >
> > The file being accessed is read only to the user, and open()ed
> > with
> > O_RDONLY. The lock being requested is for a read.
> >
> > fd = open(filename, O_RDONLY, 0);
> > ...
> >
> > lblk.l_type = F_RDLCK;
> > lblk.l_start = 0;
> > lblk.l_whence= SEEK_SET;
> > lblk.l_len = 0;
> > lblk.l_pid = 0;
> > rc = fcntl(fd, F_SETLK, &lblk);
> >
> > Running the above from a remote system, the lock call fails with
> > errno set to ENOLCK. Given cred->cr_uid comes in as 227 which is
> > my uid on the remote system. Since the file is R/O to me, and the
> > VOP_ACCESS() is asking for VWRITE, it fails with errno 13, EACCES,
> > Permission denied.
> >
> > The above operations work correctly to some of our other
> > favorite big-name nfs vendors :-)
> >
> > Opinions on the "correct" way to fix this?
> >
> > 1. Since we're only asking for a read lock, why do we need to ask
> > for VWRITE? I may not understand an underlying requirement for
> > the VWRITE so please feel free to educate me if needed.
> >
> > Something like: request == F_RDLCK ? VREAD : VWRITE
> > (need to figure out where to get the request from in this
> > context).
> >
> > 2. Attempt VWRITE, fallback to VREAD... seems off to me though.
> >
I think I prefer this approach because it will never fail unless it
would fail without the patch. For the case where the client uid has
write but not read permission and attempts an F_RDLCK, I believe your
patch would fail the request whereas it will succeed without your patch.
(Although I'll admit I didn't actually test this.;-)
Doing VOP_ACCESS(..VWRITE..) first and only doing a VOP_ACCESS(..VREAD..)
if the VOP_ACCESS(..VWRITE..) fails will preserve current behaviour fot
the non-failing case, but allow an F_RDLCK for uids with read-only access.
I've attached a patch that does this variant. John, could you test this
patch?
And does anyone have an opinion w.r.t. which variant of the patch is
more appropriate?
Thanks in advance for your help, rick
> > 3. Other?
> >
> > I appreciate any thoughts on this.
> >
> > Thanks,
> > John
> >
> > While they might not follow style(9) completely, I've uploaded
> > my patch to nlm_prot.impl.c with the NLM_DEBUG() calls i've added.
> > I'd appreciate it if someone would consider committing them so
> > who ever debugs this file next will have them available.
> >
> > http://people.freebsd.org/~jwd/nlm_prot_impl.c.patch
> >
> _______________________________________________
> freebsd...@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-fs
> To unsubscribe, send any mail to "freebsd-fs-unsubscr...@freebsd.org"
--- nlm/nlm_prot_impl.c.sav 2011-12-05 10:59:00.000000000 -0500
+++ nlm/nlm_prot_impl.c 2011-12-05 20:09:03.000000000 -0500
@@ -1774,7 +1774,7 @@ struct vfs_state {
static int
nlm_get_vfs_state(struct nlm_host *host, struct svc_req *rqstp,
- fhandle_t *fhp, struct vfs_state *vs)
+ fhandle_t *fhp, struct vfs_state *vs, bool_t exclusive)
{
int error, exflags;
struct ucred *cred = NULL, *credanon;
@@ -1816,6 +1816,8 @@ nlm_get_vfs_state(struct nlm_host *host,
* Check cred.
*/
error = VOP_ACCESS(vs->vs_vp, VWRITE, cred, curthread);
+ if (error != 0 && !exclusive)
+ error = VOP_ACCESS(vs->vs_vp, VREAD, cred, curthread);
if (error)
goto out;
@@ -1896,7 +1898,7 @@ nlm_do_test(nlm4_testargs *argp, nlm4_te
goto out;
}
- error = nlm_get_vfs_state(host, rqstp, &fh, &vs);
+ error = nlm_get_vfs_state(host, rqstp, &fh, &vs, argp->exclusive);
if (error) {
result->stat.stat = nlm_convert_error(error);
goto out;
@@ -2001,7 +2003,7 @@ nlm_do_lock(nlm4_lockargs *argp, nlm4_re
goto out;
}
- error = nlm_get_vfs_state(host, rqstp, &fh, &vs);
+ error = nlm_get_vfs_state(host, rqstp, &fh, &vs, argp->exclusive);
if (error) {
result->stat.stat = nlm_convert_error(error);
goto out;
@@ -2180,7 +2182,7 @@ nlm_do_cancel(nlm4_cancargs *argp, nlm4_
goto out;
}
- error = nlm_get_vfs_state(host, rqstp, &fh, &vs);
+ error = nlm_get_vfs_state(host, rqstp, &fh, &vs, argp->exclusive);
if (error) {
result->stat.stat = nlm_convert_error(error);
goto out;
@@ -2269,7 +2271,11 @@ nlm_do_unlock(nlm4_unlockargs *argp, nlm
goto out;
}
- error = nlm_get_vfs_state(host, rqstp, &fh, &vs);
+ /*
+ * Specify FALSE so that it will try the case where there is
+ * VREAD access, when VWRITE access is denied.
+ */
+ error = nlm_get_vfs_state(host, rqstp, &fh, &vs, FALSE);
if (error) {
result->stat.stat = nlm_convert_error(error);
goto out;
_______________________________________________
freebsd-current@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
