nfs42: client needs to update file mode after ALLOCATE op
Subsystems (2)
Dai Ngo
reviewerPATCH v2 1/1 nfs42: client needs to update file mode after ALLOCATE op
The Linux NFS server strips the SUID and SGID from the file mode on ALLOCATE op. The GETATTR op in the ALLOCATE compound needs to request the file mode from the server to update its file mode in case the SUID/SGUI bit were stripped.
--- fs/nfs/nfs42proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/nfs42proc.c +1 -1
@@ -70,7 +70,7 @@ static int _nfs42_proc_fallocate(struct rpc_message *msg, struct file *filep, }nfs4_bitmask_set (bitmask, server->cache_consistency_bitmask, inode, -NFS_INO_INVALID_BLOCKS ); +NFS_INO_INVALID_BLOCKS |NFS_INO_INVALID_MODE ); res.falloc_fattr =nfs_alloc_fattr ();if (!res.falloc_fattr)
Signature · 1 line
2.39.3
Quoted 18 lines · Dai Ngo
The Linux NFS server strips the SUID and SGID from the file mode on ALLOCATE op. The GETATTR op in the ALLOCATE compound needs to request the file mode from the server to update its file mode in case the SUID/SGUI bit were stripped.
Signed-off-by Dai Ngo <[email protected]>---
fs/nfs/nfs42proc.c | 2 +-1 file changed, 1 insertion(+), 1 deletion(-)fs/nfs/nfs42proc.c +0
-0@@ -70,7 +70,7 @@ static int _nfs42_proc_fallocate(struct rpc_message *msg, struct file *filep, }
Quoted 8 lines
nfs4_bitmask_set(bitmask,
server->cache_consistency_bitmask, inode,
-NFS_INO_INVALID_BLOCKS);
+ NFS_INO_INVALID_BLOCKS |NFS_INO_INVALID_MODE);
res.falloc_fattr =nfs_alloc_fattr();
if (!res.falloc_fattr)
Actually... Wait... Why isn't the existing code sufficient?
status = nfs4_call_sync(server->client, server, msg,
&args.seq_args, &res.seq_res, 0);
if (status == 0) {
if (nfs_should_remove_suid(inode)) {
spin_lock(&inode->i_lock);
nfs_set_cache_invalid(inode, NFS_INO_INVALID_MODE);
spin_unlock(&inode->i_lock);
}
status = nfs_post_op_update_inode_force_wcc(inode,
res.falloc_fattr);
}We explicitly check for SUID bits, and invalidate the mode if they are set.
Signature · 3 lines
Trond Myklebust Linux NFS client maintainer, Hammerspace [email protected]
[email protected]
reviewerQuoted 41 lines · Trond Myklebust
Quoted 24 lines · Dai Ngo
The Linux NFS server strips the SUID and SGID from the file mode on ALLOCATE op. The GETATTR op in the ALLOCATE compound needs to request the file mode from the server to update its file mode in case the SUID/SGUI bit were stripped.
Signed-off-by Dai Ngo <[email protected]>--- fs/nfs/nfs42proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/nfs/nfs42proc.c +1
-1@@ -70,7 +70,7 @@ static int _nfs42_proc_fallocate(struct rpc_message *msg, struct file *filep, } nfs4_bitmask_set(bitmask, server->cache_consistency_bitmask, inode, - NFS_INO_INVALID_BLOCKS); + NFS_INO_INVALID_BLOCKS |NFS_INO_INVALID_MODE );Quoted 2 lines
res.falloc_fattr =
nfs_alloc_fattr();
if (!res.falloc_fattr)Actually... Wait... Why isn't the existing code sufficient?
status = nfs4_call_sync(server->client, server, msg, &args.seq_args, &res.seq_res, 0); if (status == 0) { if (nfs_should_remove_suid(inode)) { spin_lock(&inode->i_lock); nfs_set_cache_invalid(inode, NFS_INO_INVALID_MODE); spin_unlock(&inode->i_lock); } status = nfs_post_op_update_inode_force_wcc(inode, res.falloc_fattr); }
Quoted 2 lines
We explicitly check for SUID bits, and invalidate the mode if they are set.
nfs_set_cache_invalid checks for delegation and clears the NFS_INO_INVALID_MODE.
-Dai
Quoted 1 line
Quoted 47 lines · On Thu, 2023-08-24 at 09:12 -0700, [email protected] wrote:
Quoted 45 lines · Trond Myklebust
Quoted 20 lines · Dai Ngo
The Linux NFS server strips the SUID and SGID from the file mode on ALLOCATE op. The GETATTR op in the ALLOCATE compound needs to request the file mode from the server to update its file mode in case the SUID/SGUI bit were stripped.
Signed-off-by Dai Ngo <[email protected]>---
fs/nfs/nfs42proc.c | 2 +-1 file changed, 1 insertion(+), 1 deletion(-)fs/nfs/nfs42proc.c +0
-0@@ -70,7 +70,7 @@ static int _nfs42_proc_fallocate(struct
rpc_message
*msg, struct file *filep,
}
nfs4_bitmask_set(bitmask, server-Quoted 8 lines
Quoted 1 line
cache_consistency_bitmask,inode,
-NFS_INO_INVALID_BLOCKS);
+ NFS_INO_INVALID_BLOCKS |NFS_INO_INVALID_MODE);
res.falloc_fattr =nfs_alloc_fattr();
if (!res.falloc_fattr)Actually... Wait... Why isn't the existing code sufficient?
status =
nfs4_call_sync(server->client, server, msg, &args.seq_args, &res.seq_res, 0); if (status == 0) {
if (nfs_should_remove_suid(inode)) {spin_lock(&inode->i_lock);nfs_set_cache_invalid(inode, NFS_INO_INVALID_MODE);
spin_unlock(&inode->i_lock);
}
status = nfs_post_op_update_inode_force_wcc(inode,
res.falloc_fattr);
}
Quoted 7 lines
Quoted 3 lines
We explicitly check for SUID bits, and invalidate the mode if they are
set.
nfs_set_cache_invalidchecks for delegation and clears theNFS_INO_INVALID_MODE.
Oh. That just means we need to add NFS_INO_REVAL_FORCED, so let's rather do that.
Signature · 3 lines
Trond Myklebust Linux NFS client maintainer, Hammerspace [email protected]
[email protected]
reviewerQuoted 47 lines · Trond Myklebust
Quoted 46 lines · On Thu, 2023-08-24 at 09:12 -0700, [email protected] wrote:
Quoted 45 lines · Trond Myklebust
Quoted 20 lines · Dai Ngo
The Linux NFS server strips the SUID and SGID from the file mode on ALLOCATE op. The GETATTR op in the ALLOCATE compound needs to request the file mode from the server to update its file mode in case the SUID/SGUI bit were stripped.
Signed-off-by Dai Ngo <[email protected]>--- fs/nfs/nfs42proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/nfs/nfs42proc.c +0
-0@@ -70,7 +70,7 @@ static int _nfs42_proc_fallocate(struct
rpc_message
*msg, struct file *filep,
}nfs4_bitmask_set(bitmask, server-
Quoted 8 lines
Quoted 1 line
cache_consistency_bitmask,inode,
-NFS_INO_INVALID_BLOCKS);
+ NFS_INO_INVALID_BLOCKS |NFS_INO_INVALID_MODE);res.falloc_fattr =
nfs_alloc_fattr();
if (!res.falloc_fattr)Actually... Wait... Why isn't the existing code sufficient?
status =
nfs4_call_sync(server->client, server, msg, &args.seq_args, &res.seq_res, 0); if (status == 0) {
if (nfs_should_remove_suid(inode)) {spin_lock(&inode->i_lock); nfs_set_cache_invalid(inode,NFS_INO_INVALID_MODE);
spin_unlock(&inode->i_lock);
}
status = nfs_post_op_update_inode_force_wcc(inode,res.falloc_fattr);
}
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
We explicitly check for SUID bits, and invalidate the mode if they are
set.
nfs_set_cache_invalidchecks for delegation and clears theNFS_INO_INVALID_MODE.Oh. That just means we need to add
NFS_INO_REVAL_FORCED, so let's rather do that.
ok, I'll create a new patch and test it.
-Dai
Quoted 1 line
[email protected]
reviewerQuoted 49 lines · On 8/24/23 9:38 AM, [email protected] wrote:
Quoted 47 lines · Trond Myklebust
Quoted 46 lines · On Thu, 2023-08-24 at 09:12 -0700, [email protected] wrote:
Quoted 45 lines · Trond Myklebust
Quoted 19 lines · Dai Ngo
The Linux NFS server strips the SUID and SGID from the file mode on ALLOCATE op. The GETATTR op in the ALLOCATE compound needs to request the file mode from the server to update its file mode in case the SUID/SGUI bit were stripped.
Signed-off-by Dai Ngo <[email protected]>---
fs/nfs/nfs42proc.c | 2 +-1 file changed, 1 insertion(+), 1 deletion(-)fs/nfs/nfs42proc.c +0
-0@@ -70,7 +70,7 @@ static int _nfs42_proc_fallocate(struct
rpc_message
*msg, struct file *filep,
}
nfs4_bitmask_set(bitmask, server-Quoted 7 lines
Quoted 1 line
cache_consistency_bitmask,inode,
-NFS_INO_INVALID_BLOCKS); + NFS_INO_INVALID_BLOCKS |NFS_INO_INVALID_MODE);
res.falloc_fattr =nfs_alloc_fattr(); if (!res.falloc_fattr)Actually... Wait... Why isn't the existing code sufficient?
status =
nfs4_call_sync(server->client, server, msg, &args.seq_args, &res.seq_res, 0); if (status == 0) {
if (nfs_should_remove_suid(inode)) {spin_lock(&inode->i_lock);nfs_set_cache_invalid(inode, NFS_INO_INVALID_MODE);spin_unlock(&inode->i_lock);
}
status =nfs_post_op_update_inode_force_wcc(inode, res.falloc_fattr);
}We explicitly check for SUID bits, and invalidate the mode if they are
set.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
nfs_set_cache_invalidchecks for delegation and clears theNFS_INO_INVALID_MODE.Oh. That just means we need to add
NFS_INO_REVAL_FORCED, so let's rather do that.ok, I'll create a new patch and test it.
This is the new patch:
fs/nfs/nfs42proc.c +1 -1
@@ -81,7 +81,7 @@ static int _nfs42_proc_fallocate(struct rpc_message *msg, struct file *filep,if (status ==0 ) {if (nfs_should_remove_suid (inode)) {spin_lock (&inode->i_lock); -nfs_set_cache_invalid (inode,NFS_INO_INVALID_MODE ); +nfs_set_cache_invalid (inode,NFS_INO_REVAL_FORCED );spin_unlock (&inode->i_lock); } status = nfs_post_op_update_inode_force_wcc(inode,
Signature · 49 lines
2.9.5 looks like this patch causes more tests to fail: [root@nfsvmd08 xfstests-dev]# diff -u /root/xfstests-dev/tests/generic/683.out /root/xfstests-dev/results//generic/683.out.bad --- /root/xfstests-dev/tests/generic/683.out 2023-08-17 23:59:09.621604998 -0600 +++ /root/xfstests-dev/results//generic/683.out.bad 2023-08-24 12:32:49.980272051 -0600 @@ -1,19 +1,19 @@ QA output created by 683 Test 1 - qa_user, non-exec file falloc 6666 -rwSrwSrw- TEST_DIR/683/a -666 -rw-rw-rw- TEST_DIR/683/a +6666 -rwSrwSrw- TEST_DIR/683/a Test 2 - qa_user, group-exec file falloc 6676 -rwSrwsrw- TEST_DIR/683/a -676 -rw-rwxrw- TEST_DIR/683/a +6676 -rwSrwsrw- TEST_DIR/683/a Test 3 - qa_user, user-exec file falloc 6766 -rwsrwSrw- TEST_DIR/683/a -766 -rwxrw-rw- TEST_DIR/683/a +6766 -rwsrwSrw- TEST_DIR/683/a Test 4 - qa_user, all-exec file falloc 6777 -rwsrwsrwx TEST_DIR/683/a -777 -rwxrwxrwx TEST_DIR/683/a +6777 -rwsrwsrwx TEST_DIR/683/a Test 5 - root, non-exec file falloc 6666 -rwSrwSrw- TEST_DIR/683/a @@ -33,9 +33,9 @@ Test 9 - qa_user, group-exec file falloc, only sgid 2676 -rw-rwsrw- TEST_DIR/683/a -676 -rw-rwxrw- TEST_DIR/683/a +2676 -rw-rwsrw- TEST_DIR/683/a Test 10 - qa_user, all-exec file falloc, only sgid 2777 -rwxrwsrwx TEST_DIR/683/a -777 -rwxrwxrwx TEST_DIR/683/a +2777 -rwxrwsrwx TEST_DIR/683/a [root@nfsvmd08 xfstests-dev]# I'll have to dig deeper to find out why unless you already knew what the problem is. -Dai
Quoted 4 lines
-Dai
Quoted 1 line
Quoted 73 lines · On Thu, 2023-08-24 at 11:42 -0700, [email protected] wrote:
Quoted 56 lines · On 8/24/23 9:38 AM, [email protected] wrote:
Quoted 54 lines · Trond Myklebust
Quoted 53 lines · On Thu, 2023-08-24 at 09:12 -0700, [email protected] wrote:
Quoted 52 lines · Trond Myklebust
Quoted 22 lines · Dai Ngo
The Linux NFS server strips the SUID and SGID from the file mode
on ALLOCATE op. The GETATTR op in the ALLOCATE compound needs to
request the file mode from the server to update its file mode in
case the SUID/SGUI bit were stripped.Signed-off-by Dai Ngo <[email protected]>---
fs/nfs/nfs42proc.c | 2 +-1 file changed, 1 insertion(+), 1 deletion(-)fs/nfs/nfs42proc.c +0
-0@@ -70,7 +70,7 @@ static int _nfs42_proc_fallocate(struct
rpc_message
*msg, struct file *filep,
}
nfs4_bitmask_set(bitmask, server-Quoted 7 lines
Quoted 1 line
cache_consistency_bitmask,inode,
-NFS_INO_INVALID_BLOCKS); + NFS_INO_INVALID_BLOCKS |NFS_INO_INVALID_MODE);
res.falloc_fattr =nfs_alloc_fattr(); if (!res.falloc_fattr)Actually... Wait... Why isn't the existing code sufficient?
status = nfs4_call_sync(server->client, server, msg,
&args.seq_args, &res.seq_res, 0);
if (status == 0) {
if (nfs_should_remove_suid(inode)) {spin_lock(&inode->i_lock);nfs_set_cache_invalid(inode, NFS_INO_INVALID_MODE);spin_unlock(&inode->i_lock);
}
status =nfs_post_op_update_inode_force_wcc(inode, res.falloc_fattr);
}We explicitly check for SUID bits, and invalidate the mode if they
are
set.Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
nfs_set_cache_invalidchecks for delegation and clears theNFS_INO_INVALID_MODE.Oh. That just means we need to add
NFS_INO_REVAL_FORCED, so let's rather do that.ok, I'll create a new patch and test it.
This is the new patch:
fs/nfs/nfs42proc.c +0
-0
fs/nfs/nfs42proc.c static int _nfs42_proc_fallocate(struct rpc_message · line 87
Quoted 8 lines
fs/nfs/nfs42proc.c +1
-1@@ -81,7 +81,7 @@ static int _nfs42_proc_fallocate(struct rpc_message *msg, struct file *filep, if (status == 0) { if (nfs_should_remove_suid(inode)) { spin_lock(&inode->i_lock); - nfs_set_cache_invalid(inode, NFS_INO_INVALID_MODE); + nfs_set_cache_invalid(inode,NFS_INO_REVAL_FORCED );
No. The above needs to add NFS_INO_REVAL_FORCED.
IOW:
nfs_set_cache_invalid(inode, NFS_INO_INVALID_MODE | NFS_INO_REVAL_FORCED);
Quoted 3 lines
spin_unlock(&inode->i_lock);
}
status = nfs_post_op_update_inode_force_wcc(inode,
Signature · 3 lines
Trond Myklebust Linux NFS client maintainer, Hammerspace [email protected]
Dai Ngo
reviewerQuoted 89 lines · Trond Myklebust
Quoted 73 lines · On Thu, 2023-08-24 at 11:42 -0700, [email protected] wrote:
Quoted 58 lines · On 8/24/23 9:38 AM, [email protected] wrote:
Quoted 54 lines · Trond Myklebust
Quoted 53 lines · On Thu, 2023-08-24 at 09:12 -0700, [email protected] wrote:
Quoted 52 lines · Trond Myklebust
Quoted 26 lines · Dai Ngo
The Linux NFS server strips the SUID and SGID from the file mode
on ALLOCATE op. The GETATTR op in the ALLOCATE compound needs to
request the file mode from the server to update its file mode in
case the SUID/SGUI bit were stripped.Signed-off-by Dai Ngo <[email protected]>--- fs/nfs/nfs42proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/nfs/nfs42proc.c +0
-0@@ -70,7 +70,7 @@ static int _nfs42_proc_fallocate(struct
rpc_message
*msg, struct file *filep,} nfs4_bitmask_set(bitmask, server-Quoted 1 line
cache_consistency_bitmask,inode,
fs/nfs/nfs42proc.c +1
-1- NFS_INO_INVALID_BLOCKS); + NFS_INO_INVALID_BLOCKS |Quoted 3 lines
NFS_INO_INVALID_MODE); res.falloc_fattr = nfs_alloc_fattr(); if (!res.falloc_fattr)Actually... Wait... Why isn't the existing code sufficient?
status = nfs4_call_sync(server->client, server, msg, &args.seq_args, &res.seq_res, 0); if (status == 0) { if (nfs_should_remove_suid(inode)) { spin_lock(&inode->i_lock); nfs_set_cache_invalid(inode, NFS_INO_INVALID_MODE); spin_unlock(&inode->i_lock); } status = nfs_post_op_update_inode_force_wcc(inode, res.falloc_fattr); }We explicitly check for SUID bits, and invalidate the mode if they
are
set.Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
nfs_set_cache_invalidchecks for delegation and clears theNFS_INO_INVALID_MODE.Oh. That just means we need to add
NFS_INO_REVAL_FORCED, so let's rather do that.ok, I'll create a new patch and test it.
This is the new patch:
fs/nfs/nfs42proc.c +0
-0fs/nfs/nfs42proc.c static int _nfs42_proc_fallocate(struct rpc_message · line 87
Quoted 8 lines
fs/nfs/nfs42proc.c +1
-1@@ -81,7 +81,7 @@ static int _nfs42_proc_fallocate(struct rpc_message *msg, struct file *filep, if (status == 0) {if (nfs_should_remove_suid (inode)) {spin_lock (&inode->i_lock); -nfs_set_cache_invalid (inode, NFS_INO_INVALID_MODE); +nfs_set_cache_invalid (inode,NFS_INO_REVAL_FORCED );No. The above needs to add
NFS_INO_REVAL_FORCED.
Quoted 2 lines
IOW:
nfs_set_cache_invalid(inode, NFS_INO_INVALID_MODE | NFS_INO_REVAL_FORCED);
Ok, I’ll try again.
Thanks,
-Dai
Quoted 11 lines
Quoted 4 lines
spin_unlock(&inode->i_lock); } status = nfs_post_op_update_inode_force_wcc(inode,Signature · 3 lines
Trond Myklebust Linux NFS client maintainer, Hammerspace [email protected]
[email protected]
reviewerQuoted 84 lines · Dai Ngo
Quoted 84 lines · Trond Myklebust
Quoted 70 lines · On Thu, 2023-08-24 at 11:42 -0700, [email protected] wrote:
Quoted 57 lines · On 8/24/23 9:38 AM, [email protected] wrote:
Quoted 54 lines · Trond Myklebust
Quoted 53 lines · On Thu, 2023-08-24 at 09:12 -0700, [email protected] wrote:
Quoted 52 lines · Trond Myklebust
Quoted 26 lines · Dai Ngo
The Linux NFS server strips the SUID and SGID from the file mode
on ALLOCATE op. The GETATTR op in the ALLOCATE compound needs to
request the file mode from the server to update its file mode in
case the SUID/SGUI bit were stripped.Signed-off-by Dai Ngo <[email protected]>--- fs/nfs/nfs42proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/nfs/nfs42proc.c +0
-0@@ -70,7 +70,7 @@ static int _nfs42_proc_fallocate(struct
rpc_message
*msg, struct file *filep,} nfs4_bitmask_set(bitmask, server-Quoted 1 line
cache_consistency_bitmask,inode,
fs/nfs/nfs42proc.c +1
-1- NFS_INO_INVALID_BLOCKS); + NFS_INO_INVALID_BLOCKS |Quoted 3 lines
NFS_INO_INVALID_MODE); res.falloc_fattr = nfs_alloc_fattr(); if (!res.falloc_fattr)Actually... Wait... Why isn't the existing code sufficient?
status = nfs4_call_sync(server->client, server, msg, &args.seq_args, &res.seq_res, 0); if (status == 0) { if (nfs_should_remove_suid(inode)) { spin_lock(&inode->i_lock); nfs_set_cache_invalid(inode, NFS_INO_INVALID_MODE); spin_unlock(&inode->i_lock); } status = nfs_post_op_update_inode_force_wcc(inode, res.falloc_fattr); }We explicitly check for SUID bits, and invalidate the mode if they
are
set.Quoted 6 lines
Quoted 5 lines
Quoted 3 lines
nfs_set_cache_invalidchecks for delegation and clears theNFS_INO_INVALID_MODE.Oh. That just means we need to add
NFS_INO_REVAL_FORCED, so let's rather do that.ok, I'll create a new patch and test it.
This is the new patch:
fs/nfs/nfs42proc.c +0
-0fs/nfs/nfs42proc.c static int _nfs42_proc_fallocate(struct rpc_message · line 87
Quoted 8 lines
fs/nfs/nfs42proc.c +1
-1@@ -81,7 +81,7 @@ static int _nfs42_proc_fallocate(struct rpc_message *msg, struct file *filep, if (status == 0) {if (nfs_should_remove_suid (inode)) {spin_lock (&inode->i_lock); -nfs_set_cache_invalid (inode, NFS_INO_INVALID_MODE); +nfs_set_cache_invalid (inode,NFS_INO_REVAL_FORCED );No. The above needs to add
NFS_INO_REVAL_FORCED.
Quoted 3 lines
Quoted 2 lines
IOW:
nfs_set_cache_invalid(inode, NFS_INO_INVALID_MODE | NFS_INO_REVAL_FORCED);Ok, I’ll try again.
I tried again with this patch:
fs/nfs/nfs42proc.c +3 -1
@@ -80,8 +80,10 @@ static int _nfs42_proc_fallocate(struct rpc_message *msg, struct file *filep, &args.seq_args, &res.seq_res, 0);if (status ==0 ) {if (nfs_should_remove_suid (inode)) { + printk("%s: FORCE nfs_set_cache_invalid with NFS_INO_REVAL_FORCE\n", __func__); <<== for testingspin_lock (&inode->i_lock); -nfs_set_cache_invalid (inode,NFS_INO_INVALID_MODE ); +nfs_set_cache_invalid (inode, +NFS_INO_REVAL_FORCED |NFS_INO_INVALID_MODE );spin_unlock (&inode->i_lock); } status = nfs_post_op_update_inode_force_wcc(inode,
[dngo@nfsdev linux]$
and the xfstest's generic/683 still fail as with previous patch:
[root@nfsvmd08 xfstests-dev]# diff -u /root/xfstests-dev/tests/generic/683.out /root/xfstests-dev/results//generic/683.out.bad
root/xfstests-dev/results//generic/683.out.bad renamed from root/xfstests-dev/tests/generic/683.out +6 -6
@@ -1,19 +1,19 @@ QA output created by 683 Test 1 - qa_user, non-exec file falloc 6666 -rwSrwSrw- TEST_DIR/683/a -666 -rw-rw-rw- TEST_DIR/683/a +6666 -rwSrwSrw- TEST_DIR/683/a Test 2 - qa_user, group-exec file falloc 6676 -rwSrwsrw- TEST_DIR/683/a -676 -rw-rwxrw- TEST_DIR/683/a +6676 -rwSrwsrw- TEST_DIR/683/a Test 3 - qa_user, user-exec file falloc 6766 -rwsrwSrw- TEST_DIR/683/a -766 -rwxrw-rw- TEST_DIR/683/a +6766 -rwsrwSrw- TEST_DIR/683/a Test 4 - qa_user, all-exec file falloc 6777 -rwsrwsrwx TEST_DIR/683/a -777 -rwxrwxrwx TEST_DIR/683/a +6777 -rwsrwsrwx TEST_DIR/683/a Test 5 - root, non-exec file falloc 6666 -rwSrwSrw- TEST_DIR/683/a
@@ -33,9 +33,9 @@ Test 9 - qa_user, group-exec file falloc, only sgid 2676 -rw-rwsrw- TEST_DIR/683/a -676 -rw-rwxrw- TEST_DIR/683/a +2676 -rw-rwsrw- TEST_DIR/683/a Test 10 - qa_user, all-exec file falloc, only sgid 2777 -rwxrwsrwx TEST_DIR/683/a -777 -rwxrwxrwx TEST_DIR/683/a +2777 -rwxrwsrwx TEST_DIR/683/a
[root@nfsvmd08 xfstests-dev]#
I don't think adding NFS_INO_REVAL_FORCED will fix the problem because nfs_post_op_update_inode_force_wcc(inode, res.falloc_fattr) will only update the file attributes with the attributes returned from the GETATTR in the ALLOCATE compound which currently does not ask for the file's mode attribute.
-Dai
Quoted 12 lines
Thanks,
-DaiQuoted 9 lines
Quoted 3 lines
spin_unlock(&inode->i_lock); } status = nfs_post_op_update_inode_force_wcc(inode,Signature · 3 lines
Trond Myklebust Linux NFS client maintainer, Hammerspace [email protected]
[email protected]
reviewerQuoted 157 lines · On 8/24/23 3:26 PM, [email protected] wrote:
Quoted 84 lines · Dai Ngo
Quoted 84 lines · Trond Myklebust
Quoted 70 lines · On Thu, 2023-08-24 at 11:42 -0700, [email protected] wrote:
Quoted 57 lines · On 8/24/23 9:38 AM, [email protected] wrote:
Quoted 54 lines · Trond Myklebust
Quoted 53 lines · On Thu, 2023-08-24 at 09:12 -0700, [email protected] wrote:
Quoted 52 lines · Trond Myklebust
Quoted 22 lines · Dai Ngo
The Linux NFS server strips the SUID and SGID from the file mode
on ALLOCATE op. The GETATTR op in the ALLOCATE compound needs to
request the file mode from the server to update its file mode in
case the SUID/SGUI bit were stripped.Signed-off-by Dai Ngo <[email protected]>---
fs/nfs/nfs42proc.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)fs/nfs/nfs42proc.c +0
-0@@ -70,7 +70,7 @@ static int _nfs42_proc_fallocate(struct
rpc_message
*msg, struct file *filep,
}
nfs4_bitmask_set(bitmask, server-Quoted 7 lines
Quoted 1 line
cache_consistency_bitmask,inode,
-NFS_INO_INVALID_BLOCKS); +NFS_INO_INVALID_BLOCKS|NFS_INO_INVALID_MODE);
res.falloc_fattr =nfs_alloc_fattr(); if (!res.falloc_fattr)Actually... Wait... Why isn't the existing code sufficient?
status = nfs4_call_sync(server->client, server, msg,
&args.seq_args,
&res.seq_res, 0);
if (status == 0) {
if (nfs_should_remove_suid(inode)) {spin_lock(&inode->i_lock);nfs_set_cache_invalid(inode, NFS_INO_INVALID_MODE);spin_unlock(&inode->i_lock);
}
status =nfs_post_op_update_inode_force_wcc(inode, res.falloc_fattr);
}We explicitly check for SUID bits, and invalidate the mode if they
are
set.Quoted 6 lines
Quoted 5 lines
Quoted 3 lines
nfs_set_cache_invalidchecks for delegation and clears theNFS_INO_INVALID_MODE.Oh. That just means we need to add
NFS_INO_REVAL_FORCED, so let's rather do that.ok, I'll create a new patch and test it.
This is the new patch:
fs/nfs/nfs42proc.c +0
-0fs/nfs/nfs42proc.c static int _nfs42_proc_fallocate(struct rpc_message · line 87
Quoted 8 lines
fs/nfs/nfs42proc.c +1
-1@@ -81,7 +81,7 @@ static int _nfs42_proc_fallocate(struct rpc_message *msg, struct file *filep, if (status == 0) { if (nfs_should_remove_suid(inode)) { spin_lock(&inode->i_lock); - nfs_set_cache_invalid(inode, NFS_INO_INVALID_MODE); + nfs_set_cache_invalid(inode,NFS_INO_REVAL_FORCED );No. The above needs to add
NFS_INO_REVAL_FORCED.Quoted 3 lines
Quoted 2 lines
IOW:
nfs_set_cache_invalid(inode, NFS_INO_INVALID_MODE | NFS_INO_REVAL_FORCED);Ok, I’ll try again.
I tried again with this patch:
fs/nfs/nfs42proc.c +1
-0@@ -80,8 +80,10 @@ static int _nfs42_proc_fallocate(struct rpc_message *msg, struct file *filep, &args.seq_args, &res.seq_res, 0); if (status == 0) { if (nfs_should_remove_suid(inode)) { + printk("%s: FORCE nfs_set_cache_invalid withNFS_INO_REVAL_FORCE\n", __func__); <<== for testing
spin_lock(&inode->i_lock);
-nfs_set_cache_invalid(inode, NFS_INO_INVALID_MODE);
+ nfs_set_cache_invalid(inode,
+NFS_INO_REVAL_FORCED|NFS_INO_INVALID_MODE);
spin_unlock(&inode->i_lock);
}
status = nfs_post_op_update_inode_force_wcc(inode, [dngo@nfsdev linux]$and the xfstest's generic/683 still fail as with previous patch:
[root@nfsvmd08 xfstests-dev]# diff -u
/root/xfstests-dev/tests/generic/683.out/root/xfstests-dev/results//generic/683.out.bad--- /root/xfstests-dev/tests/generic/683.out 2023-08-17
23:59:09.621604998 -0600
+++ /root/xfstests-dev/results//generic/683.out.bad 2023-08-24
15:47:40.684240872 -0600fs/nfs/nfs42proc.c +0
-0@@ -1,19 +1,19 @@QA output created by 683
Test 1 -qa_user, non-exec file falloc
6666 -rwSrwSrw- TEST_DIR/683/a
-666 -rw-rw-rw- TEST_DIR/683/a
+6666 -rwSrwSrw- TEST_DIR/683/aTest 2 -
qa_user, group-exec file falloc
6676 -rwSrwsrw- TEST_DIR/683/a
-676 -rw-rwxrw- TEST_DIR/683/a
+6676 -rwSrwsrw- TEST_DIR/683/aTest 3 -
qa_user, user-exec file falloc
6766 -rwsrwSrw- TEST_DIR/683/a
-766 -rwxrw-rw- TEST_DIR/683/a
+6766 -rwsrwSrw- TEST_DIR/683/aTest 4 -
qa_user, all-exec file falloc
6777 -rwsrwsrwx TEST_DIR/683/a
-777 -rwxrwxrwx TEST_DIR/683/a
+6777 -rwsrwsrwx TEST_DIR/683/aTest 5 - root, non-exec file falloc
6666 -rwSrwSrw- TEST_DIR/683/afs/nfs/nfs42proc.c +0
-0@@ -33,9 +33,9 @@Test 9 -
qa_user, group-exec file falloc, only sgid 2676 -rw-rwsrw- TEST_DIR/683/a
-676 -rw-rwxrw- TEST_DIR/683/a
+2676 -rw-rwsrw- TEST_DIR/683/aTest 10 -
qa_user, all-exec file falloc, only sgid 2777 -rwxrwsrwx TEST_DIR/683/a
-777 -rwxrwxrwx TEST_DIR/683/a
+2777 -rwxrwsrwx TEST_DIR/683/a
Quoted 7 lines
[root@nfsvmd08 xfstests-dev]#
I don't think adding
NFS_INO_REVAL_FORCEDwill fix the problem becausenfs_post_op_update_inode_force_wcc(inode, res.falloc_fattr)will only update the file attributes with the attributes returned from the GETATTR in the ALLOCATE compound which currently does not ask for the file's mode attribute.
ops! sorry I loaded the wrong image.
With NFS_INO_REVAL_FORCED the xfstest generic/683 now passes. I will submit the v2 patch.
-Dai
Quoted 15 lines
-Dai
Quoted 12 lines
Thanks,
-DaiQuoted 9 lines
Quoted 3 lines
spin_unlock(&inode->i_lock);
}
status = nfs_post_op_update_inode_force_wcc(inode,Signature · 3 lines
Trond Myklebust Linux NFS client maintainer, Hammerspace [email protected]