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 | 39 +++++++++++++++++++++++++++++++++++++++ fs/cifs/smb2pdu.c | 13 ++++++++++++- fs/cifs/smb2proto.h | 2 ++ 3 files changed, 53 insertions(+), 1 deletion(-)
fs/cifs/smb2ops.c +39 -0
@@ -426,6 +426,45 @@ 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 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; + + rc = !!(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 +12 -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,17 @@ 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 ) { + is_dir =smb2_is_dir (xid, tcon, target_file); +if (is_dir ==1 ) + 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);#endif /* _SMB2PROTO_H */
Signature · 1 line
2.13.3
A message that is not in the archive (sent off-list or not yet received): 20171109051157.30814-1-lsahlber-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
Hi Ronnie,
fs/cifs/smb2ops.c smb2_query_file_info(const unsigned int xid, struct cifs_tcon *tcon, · line 431
Quoted 3 lines · Ronnie Sahlberg
fs/cifs/smb2ops.c +3
-0+int +smb2_is_dir (const unsigned int xid,struct cifs_tcon *tcon, +__le16 *target_file)
I think I'd feel better if the actual result was an out parameter rather than mixed with errors in the return value.
fs/cifs/smb2ops.c smb2_query_file_info(const unsigned int xid, struct cifs_tcon *tcon, · line 465
Quoted 8 lines
fs/cifs/smb2ops.c +8
-0+if (rc) + goto out; + + rc = !!(le32_to_cpu (smb2_data->Attributes) &FILE_ATTRIBUTE_DIRECTORY ); + +out: +kfree (smb2_data); +return rc;
I think this can hide EPERM (errno 1) errors.
Also it's too bad we have functions taking in utf16 params and some not but that's a whole another story. I had this idea of introducing a path struct and only serialize it at the very last moment which I'll try to implement ..one day :)
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)