Skip to content

Commit a204501

Browse files
Olga Kornievskaiachucklever
authored andcommitted
nfsd: prevent panic for nfsv4.0 closed files in nfs4_show_open
Prior to commit 3f29cc8 ("nfsd: split sc_status out of sc_type") states_show() relied on sc_type field to be of valid type before calling into a subfunction to show content of a particular stateid. From that commit, we split the validity of the stateid into sc_status and no longer changed sc_type to 0 while unhashing the stateid. This resulted in kernel oopsing for nfsv4.0 opens that stay around and in nfs4_show_open() would derefence sc_file which was NULL. Instead, for closed open stateids forgo displaying information that relies of having a valid sc_file. To reproduce: mount the server with 4.0, read and close a file and then on the server cat /proc/fs/nfsd/clients/2/states [ 513.590804] Call trace: [ 513.590925] _raw_spin_lock+0xcc/0x160 [ 513.591119] nfs4_show_open+0x78/0x2c0 [nfsd] [ 513.591412] states_show+0x44c/0x488 [nfsd] [ 513.591681] seq_read_iter+0x5d8/0x760 [ 513.591896] seq_read+0x188/0x208 [ 513.592075] vfs_read+0x148/0x470 [ 513.592241] ksys_read+0xcc/0x178 Fixes: 3f29cc8 ("nfsd: split sc_status out of sc_type") Signed-off-by: Olga Kornievskaia <[email protected]> Reviewed-by: Jeff Layton <[email protected]> Signed-off-by: Chuck Lever <[email protected]>
1 parent f58bab6 commit a204501

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

fs/nfsd/nfs4state.c

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2789,15 +2789,18 @@ static int nfs4_show_open(struct seq_file *s, struct nfs4_stid *st)
27892789
deny & NFS4_SHARE_ACCESS_READ ? "r" : "-",
27902790
deny & NFS4_SHARE_ACCESS_WRITE ? "w" : "-");
27912791

2792-
spin_lock(&nf->fi_lock);
2793-
file = find_any_file_locked(nf);
2794-
if (file) {
2795-
nfs4_show_superblock(s, file);
2796-
seq_puts(s, ", ");
2797-
nfs4_show_fname(s, file);
2798-
seq_puts(s, ", ");
2799-
}
2800-
spin_unlock(&nf->fi_lock);
2792+
if (nf) {
2793+
spin_lock(&nf->fi_lock);
2794+
file = find_any_file_locked(nf);
2795+
if (file) {
2796+
nfs4_show_superblock(s, file);
2797+
seq_puts(s, ", ");
2798+
nfs4_show_fname(s, file);
2799+
seq_puts(s, ", ");
2800+
}
2801+
spin_unlock(&nf->fi_lock);
2802+
} else
2803+
seq_puts(s, "closed, ");
28012804
nfs4_show_owner(s, oo);
28022805
if (st->sc_status & SC_STATUS_ADMIN_REVOKED)
28032806
seq_puts(s, ", admin-revoked");

0 commit comments

Comments
 (0)