mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 05:44:11 +00:00
Revert "NFSv4: Handle the special Linux file open access mode"
[ Upstream commitab0fc21bc7
] This reverts commit44942b4e45
. 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
9483d31e72
commit
a22287cf69
2 changed files with 1 additions and 2 deletions
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue