linux-toradex.git/fs/nfsd, branch v4.0.3

nfsd: fix nsfd startup race triggering BUG_ON

2015-05-06T20:04:05+00:00

commit bb7ffbf29e76b89a86ca4c3ee0d4690641f2f772 upstream.

nfsd triggered a BUG_ON in net_generic(...) when rpc_pipefs_event(...)
in fs/nfsd/nfs4recover.c was called before assigning ntfsd_net_id.
The following was observed on a MIPS 32-core processor:
kernel: Call Trace:
kernel: [] rpc_pipefs_event+0x7c/0x158 [nfsd]
kernel: [] notifier_call_chain+0x70/0xb8
kernel: [] __blocking_notifier_call_chain+0x4c/0x70
kernel: [] rpc_fill_super+0xf8/0x1a0
kernel: [] mount_ns+0xb4/0xf0
kernel: [] mount_fs+0x50/0x1f8
kernel: [] vfs_kern_mount+0x58/0xf0
kernel: [] do_mount+0x27c/0xa28
kernel: [] SyS_mount+0x98/0xe8
kernel: [] handle_sys64+0x44/0x68
kernel:
kernel:
        Code: 0040f809  00000000  2e020001 <00020336> 3c12c00d
                3c02801a  de100000 6442eb98  0040f809
kernel: ---[ end trace 7471374335809536 ]---

Fixed this behaviour by calling register_pernet_subsys(&nfsd_net_ops) before
registering rpc_pipefs_event(...) with the notifier chain.

Signed-off-by: Giuseppe Cantavenera 
Signed-off-by: Lorenzo Restelli 
Reviewed-by: Kinlong Mee 
Signed-off-by: J. Bruce Fields 
Signed-off-by: Greg Kroah-Hartman

nfsd: eliminate NFSD_DEBUG

2015-05-06T20:04:05+00:00

commit 135dd002c23054aaa056ea3162c1e0356905c195 upstream.

Commit f895b252d4edf ("sunrpc: eliminate RPC_DEBUG") introduced
use of IS_ENABLED() in a uapi header which leads to a build
failure for userspace apps trying to use :

   linux/nfsd/debug.h:18:15: error: missing binary operator before token "("
  #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
                ^

Since this was only used to define NFSD_DEBUG if CONFIG_SUNRPC_DEBUG
is enabled, replace instances of NFSD_DEBUG with CONFIG_SUNRPC_DEBUG.

Fixes: f895b252d4edf "sunrpc: eliminate RPC_DEBUG"
Signed-off-by: Mark Salter 
Reviewed-by: Jeff Layton 
Signed-off-by: J. Bruce Fields 
Signed-off-by: Greg Kroah-Hartman

nfsd4: disallow SEEK with special stateids

2015-05-06T20:04:05+00:00

commit 980608fb50aea34993ba956b71cd4602aa42b14b upstream.

If the client uses a special stateid then we'll pass a NULL file to
vfs_llseek.

Fixes: 24bab491220f " NFSD: Implement SEEK"
Cc: Anna Schumaker 
Reported-by: Christoph Hellwig 
Signed-off-by: J. Bruce Fields 
Signed-off-by: Greg Kroah-Hartman

nfsd4: fix READ permission checking

2015-05-06T20:04:05+00:00

commit 6e4891dc289cd191d46ab7ba1dcb29646644f9ca upstream.

In the case we already have a struct file (derived from a stateid), we
still need to do permission-checking; otherwise an unauthorized user
could gain access to a file by sniffing or guessing somebody else's
stateid.

Fixes: dc97618ddda9 "nfsd4: separate splice and readv cases"
Signed-off-by: J. Bruce Fields 
Signed-off-by: Greg Kroah-Hartman

nfsd4: disallow ALLOCATE with special stateids

2015-05-06T20:04:04+00:00

commit 5ba4a25ab7b13be528b23f85182f4d09cf7f71ad upstream.

vfs_fallocate will hit a NULL dereference if the client tries an
ALLOCATE or DEALLOCATE with a special stateid.  Fix that.  (We also
depend on the open to have broken any conflicting leases or delegations
for us.)

(If it turns out we need to allow special stateid's then we could do a
temporary open here in the special-stateid case, as we do for read and
write.  For now I'm assuming it's not necessary.)

Fixes: 95d871f03cae "nfsd: Add ALLOCATE support"
Cc: Anna Schumaker 
Signed-off-by: J. Bruce Fields 
Signed-off-by: Greg Kroah-Hartman

nfsd: require an explicit option to enable pNFS

2015-03-30T20:05:26+00:00

Turns out sending out layouts to any client is a bad idea if they
can't get at the storage device, so require explicit admin action
to enable pNFS.

Signed-off-by: Christoph Hellwig 
Signed-off-by: J. Bruce Fields

NFSD: Fix bad update of layout in nfsd4_return_file_layout

2015-03-26T01:13:03+00:00

With return layout as, (seg is return layout, lo is record layout)
seg->offset <= lo->offset and layout_end(seg) < layout_end(lo),
nfsd should update lo's offset to seg's end,
and,
seg->offset > lo->offset and layout_end(seg) >= layout_end(lo),
nfsd should update lo's end to seg's offset.

Fixes: 9cf514ccfa ("nfsd: implement pNFS operations")
Signed-off-by: Kinglong Mee 
Reviewed-by: Christoph Hellwig 
Signed-off-by: J. Bruce Fields

NFSD: Take care the return value from nfsd4_encode_stateid

2015-03-26T01:13:02+00:00

Signed-off-by: Kinglong Mee 
Reviewed-by: Christoph Hellwig 
Signed-off-by: J. Bruce Fields

NFSD: Printk blocklayout length and offset as format 0x%llx

2015-03-26T01:13:02+00:00

When testing pnfs with nfsd_debug on, nfsd print a negative number
of layout length and foff in nfsd4_block_proc_layoutget as,
"GET: -xxxx:-xxx 2"

Signed-off-by: Kinglong Mee 
Reviewed-by: Christoph Hellwig 
Signed-off-by: J. Bruce Fields

nfsd: return correct lockowner when there is a race on hash insert

2015-03-26T01:06:16+00:00

alloc_init_lock_stateowner can return an already freed entry if there is
a race to put openowners in the hashtable.

Noticed by inspection after Jeff Layton fixed the same bug for open
owners.  Depending on client behavior, this one may be trickier to
trigger in practice.

Fixes: c58c6610ec24 "nfsd: Protect adding/removing lock owners using client_lock"
Cc: 
Cc: Trond Myklebust 
Acked-by: Jeff Layton 
Signed-off-by: J. Bruce Fields