30 May, 2011
1 commit
-
* 'for-2.6.40' of git://linux-nfs.org/~bfields/linux: (22 commits)
nfsd: make local functions static
NFSD: Remove unused variable from nfsd4_decode_bind_conn_to_session()
NFSD: Check status from nfsd4_map_bcts_dir()
NFSD: Remove setting unused variable in nfsd_vfs_read()
nfsd41: error out on repeated RECLAIM_COMPLETE
nfsd41: compare request's opcnt with session's maxops at nfsd4_sequence
nfsd v4.1 lOCKT clientid field must be ignored
nfsd41: add flag checking for create_session
nfsd41: make sure nfs server process OPEN with EXCLUSIVE4_1 correctly
nfsd4: fix wrongsec handling for PUTFH + op cases
nfsd4: make fh_verify responsibility of nfsd_lookup_dentry caller
nfsd4: introduce OPDESC helper
nfsd4: allow fh_verify caller to skip pseudoflavor checks
nfsd: distinguish functions of NFSD_MAY_* flags
svcrpc: complete svsk processing on cb receive failure
svcrpc: take advantage of tcp autotuning
SUNRPC: Don't wait for full record to receive tcp data
svcrpc: copy cb reply instead of pages
svcrpc: close connection if client sends short packet
svcrpc: note network-order types in svc_process_calldir
...
19 May, 2011
1 commit
-
This also fixes a number of sparse warnings.
Signed-off-by: Daniel Mack
Cc: Trond Myklebust
Cc: J. Bruce Fields
Cc: Neil Brown
Signed-off-by: J. Bruce Fields
10 May, 2011
1 commit
-
- kenrel -> kernel
- whetehr -> whether
- ttt -> tt
- sss -> ssSigned-off-by: Justin P. Mattock
Signed-off-by: Jiri Kosina
30 Apr, 2011
9 commits
-
Compiling gave me this warning:
fs/nfsd/nfs4xdr.c: In function ‘nfsd4_decode_bind_conn_to_session’:
fs/nfsd/nfs4xdr.c:427:6: warning: variable ‘dummy’ set but not used
[-Wunused-but-set-variable]The local variable "dummy" wasn't being used past the READ32() macro that
set it. READ_BUF() should ensure that the xdr buffer is pushed past the
data read into dummy already, so nothing needs to be read in.Signed-off-by: Bryan Schumaker
[bfields@redhat.com: minor comment fixup.]
Signed-off-by: J. Bruce Fields -
Compiling gave me this warning:
fs/nfsd/nfs4state.c: In function ‘nfsd4_bind_conn_to_session’:
fs/nfsd/nfs4state.c:1623:9: warning: variable ‘status’ set but not used
[-Wunused-but-set-variable]The local variable "status" was being set by nfsd4_map_bcts_dir() and
then ignored before calling nfsd4_new_conn().Signed-off-by: Bryan Schumaker
Signed-off-by: J. Bruce Fields -
Compiling gave me this warning:
fs/nfsd/vfs.c: In function ‘nfsd_vfs_read’:
fs/nfsd/vfs.c:880:16: warning: variable ‘inode’ set but not used
[-Wunused-but-set-variable]I discovered that a local variable "inode" was being set towards the
beginning of nfsd_vfs_read() and then ignored for the rest of the
function.Signed-off-by: Bryan Schumaker
Signed-off-by: J. Bruce Fields -
Servers are supposed to return nfserr_complete_already to clients that
attempt to send multiple RECLAIM_COMPLETEs.Signed-off-by: Mi Jinlong
Signed-off-by: J. Bruce Fields -
Make sure nfs server errors out if request contains more ops
than channel allows.Signed-off-by: Mi Jinlong
[bfields@redhat.com: use helper function]
Signed-off-by: J. Bruce Fields -
RFC 5661 Section 18.11.3
The clientid field of the owner MAY be set to any value by the client
and MUST be ignored by the server. The reason the server MUST ignore
the clientid field is that the server MUST derive the client ID from
the session ID from the SEQUENCE operation of the COMPOUND request.Signed-off-by: Andy Adamson
Signed-off-by: J. Bruce Fields -
Teach the NFS server to reject invalid create_session flags.
Also do some minor formatting adjustments.
Signed-off-by: Mi Jinlong
Signed-off-by: J. Bruce Fields -
The NFS server uses nfsd_create_v3 to handle EXCLUSIVE4_1 opens, but
that function is not prepared to handle them.Rename nfsd_create_v3() to do_nfsd_create(), and add handling of
EXCLUSIVE4_1.Signed-off-by: Mi Jinlong
Signed-off-by: J. Bruce Fields -
When PUTFH is followed by an operation that uses the filehandle, and
when the current client is using a security flavor that is inconsistent
with the given filehandle, we have a choice: we can return WRONGSEC
either when the current filehandle is set using the PUTFH, or when the
filehandle is first used by the following operation.Follow the recommendations of RFC 5661 in making this choice.
(Our current behavior prevented the client from doing security
negotiation by returning WRONGSEC on PUTFH+SECINFO_NO_NAME.)Signed-off-by: J. Bruce Fields
20 Apr, 2011
2 commits
-
An open on a NFS4 share using the O_CREAT flag on an existing file for
which we have permissions to open but contained in a directory with no
write permissions will fail with EACCES.A tcpdump shows that the client had set the open mode to UNCHECKED which
indicates that the file should be created if it doesn't exist and
encountering an existing flag is not an error. Since in this case the
file exists and can be opened by the user, the NFS server is wrong in
attempting to check create permissions on the parent directory.The patch adds a conditional statement to check for create permissions
only if the file doesn't exist.Signed-off-by: Sachin S. Prabhu
Signed-off-by: J. Bruce Fields -
23fcf2ec93fb8573a653408316af599939ff9a8e (nfsd4: fix oops on lock failure)
The above patch breaks free path for stp->st_file. If stp was inserted
into sop->so_stateids, we have to free stp->st_file refcount. Because
stp->st_file refcount itself is taken whether or not any refcounts are
taken on the stp->st_file->fi_fds[].Signed-off-by: OGAWA Hirofumi
Cc: stable@kernel.org
Signed-off-by: J. Bruce Fields
19 Apr, 2011
1 commit
-
Introduced by acfdf5c383b38f7f4dddae41b97c97f1ae058f49.
Cc: stable@kernel.org
Reported-by: Gerhard Heift
Signed-off-by: J. Bruce Fields
12 Apr, 2011
1 commit
-
* 'for-2.6.39' of git://linux-nfs.org/~bfields/linux:
nfsd4: fix oops on lock failure
nfsd: fix auth_domain reference leak on nlm operations
11 Apr, 2011
5 commits
-
The secinfo caller actually won't want this.
Signed-off-by: J. Bruce Fields
-
Signed-off-by: J. Bruce Fields
-
Signed-off-by: J. Bruce Fields
-
Most of the NFSD_MAY_* flags actually request permissions, but over the
years we've accreted a few that modify the behavior of the permission or
open code in other ways.Distinguish the two cases a little more. In particular, allow the
shortcut at the start of nfsd_permission to ignore the
non-permission-requesting bits.Signed-off-by: J. Bruce Fields
-
Lock stateid's can have access_bmap 0 if they were only partially
initialized (due to a failed lock request); handle that case in
free_generic_stateid.------------[ cut here ]------------
kernel BUG at fs/nfsd/nfs4state.c:380!
invalid opcode: 0000 [#1] SMP
last sysfs file: /sys/kernel/mm/ksm/run
Modules linked in: nfs fscache md4 nls_utf8 cifs ip6table_filter ip6_tables ebtable_nat ebtables ipt_MASQUERADE iptable_nat nf_nat bridge stp llc nfsd lockd nfs_acl auth_rpcgss sunrpc ipv6 ppdev parport_pc parport pcnet32 mii pcspkr microcode i2c_piix4 BusLogic floppy [last unloaded: mperf]Pid: 1468, comm: nfsd Not tainted 2.6.38+ #120 VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform
EIP: 0060:[] EFLAGS: 00010297 CPU: 0
EIP is at nfs4_access_to_omode+0x1c/0x29 [nfsd]
EAX: ffffffff EBX: dd758120 ECX: 00000000 EDX: 00000004
ESI: dd758120 EDI: ddfe657c EBP: dd54dde0 ESP: dd54dde0
DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
Process nfsd (pid: 1468, ti=dd54c000 task=ddc92580 task.ti=dd54c000)
Stack:
dd54ddf0 e24f19ca 00000000 ddfe6560 dd54de08 e24f1a5d dd758130 deee3a20
ddfe6560 31270000 dd54df1c e24f52fd 0000000f dd758090 e2505dd0 0be304cf
dbb51d68 0000000e ddfe657c ddcd8020 dd758130 dd758128 dd7580d8 dd54de68
Call Trace:
[] free_generic_stateid+0x1c/0x3e [nfsd]
[] release_lockowner+0x71/0x8a [nfsd]
[] nfsd4_lock+0x617/0x66c [nfsd]
[] ? nfsd_setuser+0x199/0x1bb [nfsd]
[] ? nfsd_setuser_and_check_port+0x65/0x81 [nfsd]
[] ? _cond_resched+0x8/0x1c
[] ? slab_pre_alloc_hook.clone.33+0x23/0x27
[] ? kmem_cache_alloc+0x1a/0xd2
[] ? __call_rcu+0xd7/0xdd
[] ? fh_verify+0x401/0x452 [nfsd]
[] ? nfsd4_encode_operation+0x52/0x117 [nfsd]
[] ? nfsd4_putfh+0x33/0x3b [nfsd]
[] ? nfsd4_delegreturn+0xd4/0xd4 [nfsd]
[] nfsd4_proc_compound+0x1ea/0x33e [nfsd]
[] nfsd_dispatch+0xd1/0x1a5 [nfsd]
[] svc_process_common+0x282/0x46f [sunrpc]
[] svc_process+0xdc/0xfa [sunrpc]
[] nfsd+0xd6/0x115 [nfsd]
[] ? nfsd_shutdown+0x24/0x24 [nfsd]
[] kthread+0x62/0x67
[] ? kthread_worker_fn+0x114/0x114
[] kernel_thread_helper+0x6/0x10
Code: eb 05 b8 00 00 27 4f 8d 65 f4 5b 5e 5f 5d c3 83 e0 03 55 83 f8 02 89 e5 74 17 83 f8 03 74 05 48 75 09 eb 09 b8 02 00 00 00 eb 0b 0b 31 c0 eb 05 b8 01 00 00 00 5d c3 55 89 e5 57 56 89 d6 8d
EIP: [] nfs4_access_to_omode+0x1c/0x29 [nfsd] SS:ESP 0068:dd54dde0
---[ end trace 2b0bf6c6557cb284 ]---The trace route is:
-> nfsd4_lock()
-> if (lock->lk_is_new) {
-> alloc_init_lock_stateid()3739: stp->st_access_bmap = 0;
->if (status && lock->lk_is_new && lock_sop)
-> release_lockowner()
-> free_generic_stateid()
-> nfs4_access_bmap_to_omode()
-> nfs4_access_to_omode()380: BUG(); *****
This problem was introduced by 0997b173609b9229ece28941c118a2a9b278796e.
Reported-by: Mi Jinlong
Tested-by: Mi Jinlong
Signed-off-by: J. Bruce Fields
08 Apr, 2011
1 commit
31 Mar, 2011
1 commit
-
Fixes generated by 'codespell' and manually reviewed.
Signed-off-by: Lucas De Marchi
25 Mar, 2011
1 commit
-
This was noticed by users who performed more than 2^32 lock operations
and hence made this counter overflow (eventually leading to
use-after-free's). Setting rq_client to NULL here means that it won't
later get auth_domain_put() when it should be.Appears to have been introduced in 2.5.42 by "[PATCH] kNFSd: Move auth
domain lookup into svcauth" which moved most of the rq_client handling
to common svcauth code, but left behind this one line.Cc: Neil Brown
Cc: stable@kernel.org
Signed-off-by: J. Bruce Fields
24 Mar, 2011
1 commit
-
* 'for-2.6.39' of git://linux-nfs.org/~bfields/linux:
SUNRPC: Remove resource leak in svc_rdma_send_error()
nfsd: wrong index used in inner loop
nfsd4: fix comment and remove unused nfsd4_file fields
nfs41: make sure nfs server return right ca_maxresponsesize_cached
nfsd: fix compile error
svcrpc: fix bad argument in unix_domain_find
nfsd4: fix struct file leak
nfsd4: minor nfs4state.c reshuffling
svcrpc: fix rare race on unix_domain creation
nfsd41: modify the members value of nfsd4_op_flags
nfsd: add proc file listing kernel's gss_krb5 enctypes
gss:krb5 only include enctype numbers in gm_upcall_enctypes
NFSD, VFS: Remove dead code in nfsd_rename()
nfsd: kill unused macro definition
locks: use assign_type()
18 Mar, 2011
4 commits
-
it's always false now
Signed-off-by: Al Viro
-
We must not use dummy for index.
After the first index, READ32(dummy) will change dummy!!!!Signed-off-by: Mi Jinlong
[bfields@redhat.com: Trond points out READ_BUF alone is sufficient.]
Cc: stable@kernel.org
Signed-off-by: J. Bruce Fields -
This needs a further fixup!
-
A couple fields here were left over from a previous version of a patch,
and are no longer used.Signed-off-by: J. Bruce Fields
16 Mar, 2011
1 commit
-
According to rfc5661,
ca_maxresponsesize_cached:
Like ca_maxresponsesize, but the maximum size of a reply that
will be stored in the reply cache (Section 2.10.6.1). For each
channel, the server MAY decrease this value, but MUST NOT
increase it.the latest kernel(2.6.38-rc8) may increase the value for ignoring
request's ca_maxresponsesize_cached value. We should not ignore it.Signed-off-by: Mi Jinlong
Signed-off-by: J. Bruce Fields
15 Mar, 2011
1 commit
-
"fs/built-in.o: In function `supported_enctypes_show':
nfsctl.c:(.text+0x7beb0): undefined reference to `gss_mech_get_by_name'
nfsctl.c:(.text+0x7bebc): undefined reference to `gss_mech_put'
"Reported-by: Guennadi Liakhovetski
Signed-off-by: J. Bruce Fields
09 Mar, 2011
3 commits
-
Index i was already used in the outer loop
Cc: stable@kernel.org
Signed-off-by: Roel Kluin
Signed-off-by: J. Bruce Fields -
Make sure we properly reference count the struct files that a lock
depends on, and release them when the lock stateid is released.This fixes a major leak of struct files when using locking over nfsv4.
Cc: stable@kernel.org
Reported-by: Rick Koshi
Tested-by: Ivo Přikryl
Signed-off-by: J. Bruce Fields -
Minor cleanup in preparation for a bugfix--moving some code to avoid
forward references, etc. No change in functionality.Cc: stable@kernel.org
Signed-off-by: J. Bruce Fields
08 Mar, 2011
5 commits
-
The members of nfsd4_op_flags, (ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS)
equals to ALLOWED_AS_FIRST_OP, maybe that's not what we want.OP_PUTROOTFH with op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
can't appears as the first operation with out SEQUENCE ops.This patch modify the wrong value of ALLOWED_WITHOUT_FH etc which
was introduced by f9bb94c4.Cc: stable@kernel.org
Reviewed-by: Benny Halevy
Signed-off-by: Mi Jinlong
Signed-off-by: J. Bruce Fields -
Add a new proc file which lists the encryption types supported
by the kernel's gss_krb5 code.Newer MIT Kerberos libraries support the assertion of acceptor
subkeys. This enctype information allows user-land (svcgssd)
to request that the Kerberos libraries limit the encryption
types that it uses when generating the subkeys.Signed-off-by: Kevin Coffman
Signed-off-by: J. Bruce Fields -
Currently we have the following code in fs/nfsd/vfs.c::nfsd_rename() :
...
host_err = nfsd_break_lease(odentry->d_inode);
if (host_err)
goto out_drop_write;
if (ndentry->d_inode) {
host_err = nfsd_break_lease(ndentry->d_inode);
if (host_err)
goto out_drop_write;
}
if (host_err)
goto out_drop_write;
...'host_err' is guaranteed to be 0 by the time we test 'ndentry->d_inode'.
If 'host_err' becomes != 0 inside the 'if' statement, then we goto
'out_drop_write'. So, after the 'if' statement there is no way that
'host_err' can be anything but 0, so the test afterwards is just dead
code.
This patch removes the dead code.Signed-off-by: Jesper Juhl
Signed-off-by: J. Bruce Fields -
These macros had never been used for several years.
So, remove them.Signed-off-by: Shan Wei
Signed-off-by: J. Bruce Fields -
In case of a nonempty list, the return on error here is obviously bogus;
it ends up being a pointer to the list head instead of to any valid
delegation on the list.In particular, if nfsd4_delegreturn() hits this case, and you're quite unlucky,
then renew_client may oops, and it may take an embarassingly long time to
figure out why. Facepalm.BUG: unable to handle kernel NULL pointer dereference at 0000000000000090
IP: [] nfsd4_delegreturn+0x125/0x200
...Cc: stable@kernel.org
Signed-off-by: J. Bruce Fields
23 Feb, 2011
1 commit
-
Fix bug introduced in patch
85a56480 NFSD: Update XDR decoders in NFSv4 callback clientAlthough decode_cb_sequence4resok ignores highest slotid and target highest slotid
it must account for their space in their xdr stream when calling xdr_inline_decodeCc: Chuck Lever
Signed-off-by: Benny Halevy
Signed-off-by: J. Bruce Fields
