Skip to content

Commit

Permalink
Revert "NFSv4: Handle the special Linux file open access mode"
Browse files Browse the repository at this point in the history
This reverts commit 44942b4.

After secondly opening a file with O_ACCMODE|O_DIRECT flags,
nfs4_valid_open_stateid() will dereference NULL nfs4_state when lseek().

Reproducer:
  1. mount -t nfs -o vers=4.2 $server_ip:/ /mnt/
  2. fd = open("/mnt/file", O_ACCMODE|O_DIRECT|O_CREAT)
  3. close(fd)
  4. fd = open("/mnt/file", O_ACCMODE|O_DIRECT)
  5. lseek(fd)

Reported-by: Lyu Tao <tao.lyu@epfl.ch>
Signed-off-by: ChenXiaoSong <chenxiaosong2@huawei.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
  • Loading branch information
ChenXiaoSong authored and Trond Myklebust committed Mar 30, 2022
1 parent 7c9d845 commit ab0fc21
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion fs/nfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -1180,7 +1180,6 @@ int nfs_open(struct inode *inode, struct file *filp)
nfs_fscache_open_file(inode, filp);
return 0;
}
EXPORT_SYMBOL_GPL(nfs_open);

/*
* This function is called whenever some part of NFS notices that
Expand Down
2 changes: 1 addition & 1 deletion fs/nfs/nfs4file.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ nfs4_file_open(struct inode *inode, struct file *filp)
return err;

if ((openflags & O_ACCMODE) == 3)
return nfs_open(inode, filp);
openflags--;

/* We can't create new files here */
openflags &= ~(O_CREAT|O_EXCL);
Expand Down

0 comments on commit ab0fc21

Please sign in to comment.