cifs: fix return code when failing to rename a file onto a directory
Subsystems (2)
PATCH 1/1 cifs: fix return code when failing to rename a file onto a directory
Cifs servers return ACCESS_DENIED when trying to rename onto a non-empty directory. This is different from xfstest where we expect this to return -EEXIST instead.
As a workaround, if we failed to rename the file and we got -EACCES then try to open the target file and check the attributes if it is a directory or not and if so remap the error to -EEXIST.
This makes us pass xfstest generic/245
--- fs/cifs/smb2ops.c | 40 ++++++++++++++++++++++++++++++++++++++++ fs/cifs/smb2pdu.c | 12 +++++++++++- fs/cifs/smb2proto.h | 2 ++ 3 files changed, 53 insertions(+), 1 deletion(-)
fs/cifs/smb2ops.c +40 -0
@@ -426,6 +426,46 @@ smb2_query_file_info(const unsigned int xid, struct cifs_tcon *tcon,return rc; } +int +smb2_is_dir (const unsigned int xid,struct cifs_tcon *tcon, +__le16 *target_file,int *is_dir) +{ +int rc; +u8 oplock =SMB2_OPLOCK_LEVEL_NONE ; +struct cifs_open_parms oparms; +struct cifs_fid fid; +struct smb2_file_all_info *smb2_data; + + smb2_data =kzalloc (sizeof (struct smb2_file_all_info ) +PATH_MAX *2 , +GFP_KERNEL ); +if (smb2_data ==NULL ) +return -ENOMEM ; + + oparms.tcon = tcon; + oparms.desired_access =FILE_READ_ATTRIBUTES ; + oparms.disposition =FILE_OPEN ; + oparms.create_options =0 ; + oparms.fid = &fid; + oparms.reconnect = false; + + rc =SMB2_open (xid, &oparms, target_file, &oplock,NULL ,NULL ); +if (rc) + goto out; + + rc =SMB2_query_info (xid, tcon, fid.persistent_fid, fid.volatile_fid, + smb2_data); +SMB2_close (xid, tcon, fid.persistent_fid, fid.volatile_fid); +if (rc) + goto out; + + *is_dir = !!(le32_to_cpu (smb2_data->Attributes) & +FILE_ATTRIBUTE_DIRECTORY ); + +out: +kfree (smb2_data); +return rc; +} +#ifdef CONFIG_CIFS_XATTR static ssize_t move_smb2_ea_to_cifs(char *dst, size_t dst_size,
fs/cifs/smb2pdu.c +11 -1
@@ -3144,7 +3144,7 @@ SMB2_rename(const unsigned int xid, struct cifs_tcon *tcon,struct smb2_file_rename_info info;void **data;unsigned int size[2 ]; -int rc; +int rc, is_dir;int len = (2 *UniStrnlen ((wchar_t *)target_file,PATH_MAX )); data =kmalloc (sizeof (void *) *2 ,GFP_KERNEL );
@@ -3165,6 +3165,16 @@ SMB2_rename(const unsigned int xid, struct cifs_tcon *tcon, rc =send_set_info (xid, tcon, persistent_fid, volatile_fid, current->tgid,FILE_RENAME_INFORMATION ,SMB2_O_INFO_FILE ,0 ,2 , data, size); + +/* SMB2 servers responds with ACCESS_DENIED when trying to rename +* and replace onto a non-empty directory. Check for this and remap +* to EEXIST. +*/ +if (rc == -EACCES ) { +if (!smb2_is_dir (xid, tcon, target_file, &is_dir) && is_dir) + rc = -EEXIST ; + } +kfree (data);return rc; }
fs/cifs/smb2proto.h +2 -0
@@ -203,4 +203,6 @@ extern int smb3_validate_negotiate(const unsigned int, struct cifs_tcon *);extern enum securityEnum smb2_select_sectype (struct TCP_Server_Info *,enum securityEnum ); +extern int smb2_is_dir (const unsigned int xid,struct cifs_tcon *tcon, +__le16 *target_file,int *is_dir);#endif /* _SMB2PROTO_H */
Signature · 1 line
2.13.3
A message that is not in the archive (sent off-list or not yet received): 20171109235249.8013-1-lsahlber-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
2017-11-09 15:52 GMT-08:00 Ronnie Sahlberg <[email protected]>:
Quoted 43 lines
Cifs servers return
ACCESS_DENIEDwhen trying to rename onto a non-empty directory. This is different from xfstest where we expect this to return-EEXISTinstead.As a workaround, if we failed to rename the file and we got
-EACCESthen try to open the target file and check the attributes if it is a directory or not and if so remap the error to-EEXIST.This makes us pass xfstest generic/245
Signed-off-by Ronnie Sahlberg <[email protected]>--- fs/cifs/smb2ops.c | 40 ++++++++++++++++++++++++++++++++++++++++ fs/cifs/smb2pdu.c | 12 +++++++++++- fs/cifs/smb2proto.h | 2 ++ 3 files changed, 53 insertions(+), 1 deletion(-)fs/cifs/smb2ops.c +18
-0@@ -426,6 +426,46 @@ smb2_query_file_info(const unsigned int xid, struct cifs_tcon *tcon,return rc; } +int +smb2_is_dir (const unsigned int xid,struct cifs_tcon *tcon, +__le16 *target_file,int *is_dir) +{ +int rc; +u8 oplock =SMB2_OPLOCK_LEVEL_NONE ; +struct cifs_open_parms oparms; +struct cifs_fid fid; +struct smb2_file_all_info *smb2_data; + + smb2_data =kzalloc (sizeof (struct smb2_file_all_info ) +PATH_MAX *2 , +GFP_KERNEL ); +if (smb2_data ==NULL ) +return -ENOMEM ; + + oparms.tcon = tcon; + oparms.desired_access =FILE_READ_ATTRIBUTES ; + oparms.disposition =FILE_OPEN ;
fs/cifs/smb2ops.c smb2_query_file_info(const unsigned int xid, struct cifs_tcon *tcon, · line 456
Quoted 10 lines
fs/cifs/smb2ops.c +10
-0+ oparms.create_options =0 ; + oparms.fid = &fid; + oparms.reconnect = false; + + rc =SMB2_open (xid, &oparms, target_file, &oplock,NULL ,NULL ); +if (rc) + goto out; + + rc =SMB2_query_info (xid, tcon, fid.persistent_fid, fid.volatile_fid, + smb2_data);
Can't we use FILE_DIRECTORY_FILE flag in CreateOptions of SMB2_CREATE command and avoid querying attributes from the server? This will save us 1 or 2 round trips.
Quoted 31 lines
fs/cifs/smb2ops.c +12
-0+SMB2_close (xid, tcon, fid.persistent_fid, fid.volatile_fid); +if (rc) + goto out; + + *is_dir = !!(le32_to_cpu (smb2_data->Attributes) & +FILE_ATTRIBUTE_DIRECTORY ); + +out: +kfree (smb2_data); +return rc; +} +#ifdef CONFIG_CIFS_XATTR static ssize_t move_smb2_ea_to_cifs(char *dst, size_t dst_size,fs/cifs/smb2pdu.c +1
-1@@ -3144,7 +3144,7 @@ SMB2_rename(const unsigned int xid, struct cifs_tcon *tcon,struct smb2_file_rename_info info;void **data;unsigned int size[2 ]; -int rc; +int rc, is_dir;int len = (2 *UniStrnlen ((wchar_t *)target_file,PATH_MAX )); data =kmalloc (sizeof (void *) *2 ,GFP_KERNEL );@@ -3165,6 +3165,16 @@ SMB2_rename(const unsigned int xid, struct cifs_tcon *tcon, rc = send_set_info(xid, tcon, persistent_fid, volatile_fid, current->tgid, FILE_RENAME_INFORMATION, SMB2_O_INFO_FILE,
fs/cifs/smb2pdu.c SMB2_rename(const unsigned int xid, struct cifs_tcon *tcon, · line 3176
Quoted 10 lines
fs/cifs/smb2pdu.c +9
-00, 2, data, size); + +/* SMB2 servers responds with ACCESS_DENIED when trying to rename +* and replace onto a non-empty directory. Check for this and remap +* to EEXIST. +*/ +if (rc == -EACCES ) { +if (!smb2_is_dir (xid, tcon, target_file, &is_dir) && is_dir) + rc = -EEXIST ; + }
What if the target is directory but the permissions are read-only?
Quoted 18 lines
fs/cifs/smb2pdu.c +1
-0+kfree (data);return rc; }fs/cifs/smb2proto.h +2
-1@@ -203,4 +203,6 @@ extern int smb3_validate_negotiate(const unsigned int, struct cifs_tcon *);extern enum securityEnum smb2_select_sectype (struct TCP_Server_Info *,enum securityEnum ); +extern int smb2_is_dir (const unsigned int xid,struct cifs_tcon *tcon, +__le16 *target_file,int *is_dir);#endif /* _SMB2PROTO_H */ --2.13.3
Quoted 4 lines
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Best regards,
Pavel Shilovsky
A message that is not in the archive (sent off-list or not yet received): CAKywueStf29fgZ-52ONqL+WLSYotaVwMpsqnu2gQdppuw5xtoA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Quoted 114 lines · Pavel Shilovsky
2017-11-09 15:52 GMT-08:00 Ronnie Sahlberg <[email protected]>:
Quoted 43 lines
Cifs servers return
ACCESS_DENIEDwhen trying to rename onto a non-empty directory. This is different from xfstest where we expect this to return-EEXISTinstead.As a workaround, if we failed to rename the file and we got
-EACCESthen try to open the target file and check the attributes if it is a directory or not and if so remap the error to-EEXIST.This makes us pass xfstest generic/245
Signed-off-by Ronnie Sahlberg <[email protected]>--- fs/cifs/smb2ops.c | 40 ++++++++++++++++++++++++++++++++++++++++ fs/cifs/smb2pdu.c | 12 +++++++++++- fs/cifs/smb2proto.h | 2 ++ 3 files changed, 53 insertions(+), 1 deletion(-)fs/cifs/smb2ops.c +18
-0@@ -426,6 +426,46 @@ smb2_query_file_info(const unsigned int xid, struct cifs_tcon *tcon,return rc; } +int +smb2_is_dir (const unsigned int xid,struct cifs_tcon *tcon, +__le16 *target_file,int *is_dir) +{ +int rc; +u8 oplock =SMB2_OPLOCK_LEVEL_NONE ; +struct cifs_open_parms oparms; +struct cifs_fid fid; +struct smb2_file_all_info *smb2_data; + + smb2_data =kzalloc (sizeof (struct smb2_file_all_info ) +PATH_MAX *2 , +GFP_KERNEL ); +if (smb2_data ==NULL ) +return -ENOMEM ; + + oparms.tcon = tcon; + oparms.desired_access =FILE_READ_ATTRIBUTES ; + oparms.disposition =FILE_OPEN ;fs/cifs/smb2ops.c smb2_query_file_info(const unsigned int xid, struct cifs_tcon *tcon, · line 456
Quoted 10 lines
fs/cifs/smb2ops.c +10
-0+ oparms.create_options =0 ; + oparms.fid = &fid; + oparms.reconnect = false; + + rc =SMB2_open (xid, &oparms, target_file, &oplock,NULL ,NULL ); +if (rc) + goto out; + + rc =SMB2_query_info (xid, tcon, fid.persistent_fid, fid.volatile_fid, + smb2_data);Can't we use
FILE_DIRECTORY_FILEflag in CreateOptions ofSMB2_CREATEcommand and avoid querying attributes from the server? This will save us 1 or 2 round trips.Quoted 31 lines
fs/cifs/smb2ops.c +12
-0+SMB2_close (xid, tcon, fid.persistent_fid, fid.volatile_fid); +if (rc) + goto out; + + *is_dir = !!(le32_to_cpu (smb2_data->Attributes) & +FILE_ATTRIBUTE_DIRECTORY ); + +out: +kfree (smb2_data); +return rc; +} +#ifdef CONFIG_CIFS_XATTR static ssize_t move_smb2_ea_to_cifs(char *dst, size_t dst_size,fs/cifs/smb2pdu.c +1
-1@@ -3144,7 +3144,7 @@ SMB2_rename(const unsigned int xid, struct cifs_tcon *tcon,struct smb2_file_rename_info info;void **data;unsigned int size[2 ]; -int rc; +int rc, is_dir;int len = (2 *UniStrnlen ((wchar_t *)target_file,PATH_MAX )); data =kmalloc (sizeof (void *) *2 ,GFP_KERNEL );@@ -3165,6 +3165,16 @@ SMB2_rename(const unsigned int xid, struct cifs_tcon *tcon, rc = send_set_info(xid, tcon, persistent_fid, volatile_fid, current->tgid, FILE_RENAME_INFORMATION, SMB2_O_INFO_FILE,fs/cifs/smb2pdu.c SMB2_rename(const unsigned int xid, struct cifs_tcon *tcon, · line 3176
Quoted 10 lines
fs/cifs/smb2pdu.c +9
-00, 2, data, size); + +/* SMB2 servers responds with ACCESS_DENIED when trying to rename +* and replace onto a non-empty directory. Check for this and remap +* to EEXIST. +*/ +if (rc == -EACCES ) { +if (!smb2_is_dir (xid, tcon, target_file, &is_dir) && is_dir) + rc = -EEXIST ; + }What if the target is directory but the permissions are read-only?
Quoted 10 lines
fs/cifs/smb2pdu.c +1
-0+kfree (data);return rc; }fs/cifs/smb2proto.h +0
-0@@ -203,4 +203,6 @@ extern int smb3_validate_negotiate(const unsigned int, struct cifs_tcon *);
Quoted 8 lines
Quoted 8 lines
fs/cifs/smb2proto.h +2
-1extern enum securityEnum smb2_select_sectype (struct TCP_Server_Info *,enum securityEnum ); +extern int smb2_is_dir (const unsigned int xid,struct cifs_tcon *tcon, +__le16 *target_file,int *is_dir);#endif /* _SMB2PROTO_H */ --2.13.3
Pavel makes good points ...
Signature · 3 lines
Thanks, Steve
Quoted 2 lines · Pavel Shilovsky
What if the target is directory but the permissions are read-only?
I get the same resulsts on a local filesystem (xfs) and on a mounted smb2 windows2016 share (both with and without the patch applied):
overwrite dir b with file a (with access to b)
=======================rename("test/a", "test/b") = -1 EISDIR (Is a directory)
overwrite dir b with file a (without access to b)
=======================rename("test/a", "test/b") = -1 EISDIR (Is a directory)
overwrite file b with file a (with access to b)
=======================rename("test/a", "test/b") = 0
overwrite file b with file a (without access to b)
=======================rename("test/a", "test/b") = 0
So.. I'm not sure what the xfstest test is doing.
The only difference between the local and remote fs is that for cifs you can't delete test if you can't access test/b. (I am deleting "test" between my tests).
That is on cifs:
mkdir -p test/b
chmod a-rw test/b
rm -rf test
Will fail, but works on xfs. You you strace rm you will see:
unlinkat(4, "b", AT_REMOVEDIR) = -1 EACCES (Permission denied)
I think this is due to the fundamental difference in how file removal permission works in Windows vs POSIX. In POSIX you need +w on the parent dir ("test") to be able to delete a file. On Windows there is a special delete permission on the object itself. Not sure if this is "fixable".
Cheers,
Signature · 4 lines
Aurélien Aptel / SUSE Labs Samba Team GPG: 1839 CB5F 9F5B FB9B AA97 8C99 03C8 A49B 521B D5D3 SUSE Linux GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)