Skip to content

Commit a890a2e

Browse files
Al ViroAnna Schumaker
authored andcommitted
nfs4_setup_readdir(): insufficient locking for ->d_parent->d_inode dereferencing
Theoretically it's an oopsable race, but I don't believe one can manage to hit it on real hardware; might become doable on a KVM, but it still won't be easy to attack. Anyway, it's easy to deal with - since xdr_encode_hyper() is just a call of put_unaligned_be64(), we can put that under ->d_lock and be done with that. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Anna Schumaker <anna.schumaker@oracle.com>
1 parent 902893e commit a890a2e

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

fs/nfs/nfs4proc.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,9 @@ static void nfs4_setup_readdir(u64 cookie, __be32 *verifier, struct dentry *dent
391391
*p++ = htonl(attrs); /* bitmap */
392392
*p++ = htonl(12); /* attribute buffer length */
393393
*p++ = htonl(NF4DIR);
394+
spin_lock(&dentry->d_lock);
394395
p = xdr_encode_hyper(p, NFS_FILEID(d_inode(dentry->d_parent)));
396+
spin_unlock(&dentry->d_lock);
395397

396398
readdir->pgbase = (char *)p - (char *)start;
397399
readdir->count -= readdir->pgbase;

0 commit comments

Comments
 (0)