| From 2d0dbc6ae8a5194aaecb9cfffb9053f38fce8b86 Mon Sep 17 00:00:00 2001 |
| From: Trond Myklebust <Trond.Myklebust@netapp.com> |
| Date: Fri, 8 Jun 2012 10:58:09 -0400 |
| Subject: NFSv4: Fix unnecessary delegation returns in nfs4_do_open |
| |
| From: Trond Myklebust <Trond.Myklebust@netapp.com> |
| |
| commit 2d0dbc6ae8a5194aaecb9cfffb9053f38fce8b86 upstream. |
| |
| While nfs4_do_open() expects the fmode argument to be restricted to |
| combinations of FMODE_READ and FMODE_WRITE, both nfs4_atomic_open() |
| and nfs4_proc_create will pass the nfs_open_context->mode, |
| which contains the full fmode_t. |
| |
| This patch ensures that nfs4_do_open strips the other fmode_t bits, |
| fixing a problem in which the nfs4_do_open call would result in an |
| unnecessary delegation return. |
| |
| Reported-by: Fred Isaman <iisaman@netapp.com> |
| Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/nfs/nfs4proc.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- a/fs/nfs/nfs4proc.c |
| +++ b/fs/nfs/nfs4proc.c |
| @@ -1861,6 +1861,7 @@ static struct nfs4_state *nfs4_do_open(s |
| struct nfs4_state *res; |
| int status; |
| |
| + fmode &= FMODE_READ|FMODE_WRITE; |
| do { |
| status = _nfs4_do_open(dir, dentry, fmode, flags, sattr, cred, &res); |
| if (status == 0) |
