提交 57d4a376 编写于 作者: C ChenXiaoSong 提交者: Yongqiang Liu

NFSv4: fix open failure with O_ACCMODE flag

mainline inclusion
from mainline-v5.18-rc2
commit b243874f
category: bugfix
bugzilla: 186890, https://gitee.com/openeuler/kernel/issues/I5BZTX
CVE: NA

--------------------------------

open() with O_ACCMODE|O_DIRECT flags secondly will fail.

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)

Server nfsd4_decode_share_access() will fail with error nfserr_bad_xdr when
client use incorrect share access mode of 0.

Fix this by using NFS4_SHARE_ACCESS_BOTH share access mode in client,
just like firstly opening.

Fixes: ce4ef7c0 ("NFS: Split out NFS v4 file operations")
Signed-off-by: NChenXiaoSong <chenxiaosong2@huawei.com>
Signed-off-by: NTrond Myklebust <trond.myklebust@hammerspace.com>

conflict:
	fs/nfs/internal.h
Signed-off-by: NChenXiaoSong <chenxiaosong2@huawei.com>
Reviewed-by: NZhang Xiaoxu <zhangxiaoxu5@huawei.com>
Signed-off-by: NYongqiang Liu <liuyongqiang13@huawei.com>
上级 93ed7166
...@@ -1488,16 +1488,6 @@ const struct dentry_operations nfs4_dentry_operations = { ...@@ -1488,16 +1488,6 @@ const struct dentry_operations nfs4_dentry_operations = {
}; };
EXPORT_SYMBOL_GPL(nfs4_dentry_operations); EXPORT_SYMBOL_GPL(nfs4_dentry_operations);
static fmode_t flags_to_mode(int flags)
{
fmode_t res = (__force fmode_t)flags & FMODE_EXEC;
if ((flags & O_ACCMODE) != O_WRONLY)
res |= FMODE_READ;
if ((flags & O_ACCMODE) != O_RDONLY)
res |= FMODE_WRITE;
return res;
}
static struct nfs_open_context *create_nfs_open_context(struct dentry *dentry, int open_flags, struct file *filp) static struct nfs_open_context *create_nfs_open_context(struct dentry *dentry, int open_flags, struct file *filp)
{ {
return alloc_nfs_open_context(dentry, flags_to_mode(open_flags), filp); return alloc_nfs_open_context(dentry, flags_to_mode(open_flags), filp);
......
...@@ -39,6 +39,16 @@ static inline int nfs_attr_use_mounted_on_fileid(struct nfs_fattr *fattr) ...@@ -39,6 +39,16 @@ static inline int nfs_attr_use_mounted_on_fileid(struct nfs_fattr *fattr)
return 1; return 1;
} }
static inline fmode_t flags_to_mode(int flags)
{
fmode_t res = (__force fmode_t)flags & FMODE_EXEC;
if ((flags & O_ACCMODE) != O_WRONLY)
res |= FMODE_READ;
if ((flags & O_ACCMODE) != O_RDONLY)
res |= FMODE_WRITE;
return res;
}
struct nfs_clone_mount { struct nfs_clone_mount {
const struct super_block *sb; const struct super_block *sb;
const struct dentry *dentry; const struct dentry *dentry;
......
...@@ -30,6 +30,7 @@ nfs4_file_open(struct inode *inode, struct file *filp) ...@@ -30,6 +30,7 @@ nfs4_file_open(struct inode *inode, struct file *filp)
struct dentry *parent = NULL; struct dentry *parent = NULL;
struct inode *dir; struct inode *dir;
unsigned openflags = filp->f_flags; unsigned openflags = filp->f_flags;
fmode_t f_mode;
struct iattr attr; struct iattr attr;
int err; int err;
...@@ -48,8 +49,9 @@ nfs4_file_open(struct inode *inode, struct file *filp) ...@@ -48,8 +49,9 @@ nfs4_file_open(struct inode *inode, struct file *filp)
if (err) if (err)
return err; return err;
f_mode = filp->f_mode;
if ((openflags & O_ACCMODE) == 3) if ((openflags & O_ACCMODE) == 3)
openflags--; f_mode |= flags_to_mode(openflags);
/* We can't create new files here */ /* We can't create new files here */
openflags &= ~(O_CREAT|O_EXCL); openflags &= ~(O_CREAT|O_EXCL);
...@@ -57,7 +59,7 @@ nfs4_file_open(struct inode *inode, struct file *filp) ...@@ -57,7 +59,7 @@ nfs4_file_open(struct inode *inode, struct file *filp)
parent = dget_parent(dentry); parent = dget_parent(dentry);
dir = d_inode(parent); dir = d_inode(parent);
ctx = alloc_nfs_open_context(file_dentry(filp), filp->f_mode, filp); ctx = alloc_nfs_open_context(file_dentry(filp), f_mode, filp);
err = PTR_ERR(ctx); err = PTR_ERR(ctx);
if (IS_ERR(ctx)) if (IS_ERR(ctx))
goto out; goto out;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册