smb: client: fix data loss due to broken rename(2)
Subsystems (2)
Paulo Alcantara
maintainerPATCH v2 1/1 smb: client: fix data loss due to broken rename(2)
Rename of open files in SMB2+ has been broken for a very long time, resulting in data loss as the CIFS client would fail the rename(2) call with -ENOENT and then removing the target file.
Fix this by implementing ->rename_pending_delete() for SMB2+, which will rename busy files to random filenames (e.g. silly rename) during unlink(2) or rename(2), and then marking them to delete-on-close.
Besides, introduce a FIND_RD_NO_PENDING_DELETE flag for cifs_get_readable_path() to be used in smb2_query_path_info() and smb2_query_reparse_point() so we don't end up reusing open handles of files that were already removed.
---
v1 -> v2:
* Reworked patch to perform the silly rename + delete-pending setting without compounding due to an Azure bug (compound limit of 4?).
* Fixed generic/023 generic/024 generic/035 with SMB2+ against Samba (+posix), Azure, ksmbd, and Windows Server.
* Prevent the client from re-fetching metadata from files that had been marked with CIFS_INO_DELETE_PENDING or by reusing open handles that have delete pending.
fs/smb/client/cifsglob.h | 9 ++- fs/smb/client/file.c | 18 +++++- fs/smb/client/inode.c | 75 +++++++++++++++++----- fs/smb/client/smb2inode.c | 132 ++++++++++++++++++++++++++++++++++++++ fs/smb/client/smb2ops.c | 4 ++ fs/smb/client/smb2pdu.c | 27 ++++---- fs/smb/client/smb2proto.h | 7 ++ 7 files changed, 238 insertions(+), 34 deletions(-)
fs/smb/client/cifsglob.h +6 -3
@@ -1882,9 +1882,12 @@ static inline bool is_replayable_error(int error)/* cifs_get_writable_file() flags */ -#define FIND_WR_ANY 0 -#define FIND_WR_FSUID_ONLY 1 -#define FIND_WR_WITH_DELETE 2 +enum cifs_writable_file_flags { +FIND_WR_ANY =0U , +FIND_WR_FSUID_ONLY = (1U <<0 ), +FIND_WR_WITH_DELETE = (1U <<1 ), +FIND_WR_NO_PENDING_DELETE = (1U <<2 ), +};#define MID_FREE 0#define MID_REQUEST_ALLOCATED 1
fs/smb/client/file.c +17 -1
@@ -998,7 +998,10 @@ int cifs_open(struct inode *inode, struct file *file)/* Get the cached handle as SMB2 close is deferred */ if (OPEN_FMODE (file->f_flags) &FMODE_WRITE ) { - rc =cifs_get_writable_path (tcon, full_path,FIND_WR_FSUID_ONLY , &cfile); + rc =cifs_get_writable_path (tcon, full_path, +FIND_WR_FSUID_ONLY | +FIND_WR_NO_PENDING_DELETE , + &cfile); }else { rc =cifs_get_readable_path (tcon, full_path, &cfile); }
@@ -2530,6 +2533,9 @@ cifs_get_writable_file(struct cifsInodeInfo *cifs_inode, int flags,continue ;if (with_delete && !(open_file->fid.access &DELETE ))continue ; +if ((flags &FIND_WR_NO_PENDING_DELETE ) && + open_file->status_file_deleted) +continue ;if (OPEN_FMODE (open_file->f_flags) &FMODE_WRITE ) {if (!open_file->invalidHandle) {/* found a good writable file */
@@ -2647,6 +2653,16 @@ cifs_get_readable_path(struct cifs_tcon *tcon, const char *name,spin_unlock (&tcon->open_file_lock);free_dentry_path (page); *ret_file =find_readable_file (cinode,0 ); +if (*ret_file) { +spin_lock (&cinode->open_file_lock); +if ((*ret_file)->status_file_deleted) { +spin_unlock (&cinode->open_file_lock); +cifsFileInfo_put (*ret_file); + *ret_file =NULL ; + }else { +spin_unlock (&cinode->open_file_lock); + } + }return *ret_file ?0 : -ENOENT ; }
fs/smb/client/inode.c +59 -16
113 lines not on this page · raw message
fs/smb/client/smb2inode.c +132 -0
135 lines not on this page · raw message
fs/smb/client/smb2ops.c +4 -0
@@ -5376,6 +5376,7 @@ struct smb_version_operations smb20_operations = { .llseek = smb3_llseek, .is_status_io_timeout = smb2_is_status_io_timeout, .is_network_name_deleted = smb2_is_network_name_deleted, + .rename_pending_delete = smb2_rename_pending_delete, };#endif /* CIFS_ALLOW_INSECURE_LEGACY */
@@ -5481,6 +5482,7 @@ struct smb_version_operations smb21_operations = { .llseek = smb3_llseek, .is_status_io_timeout = smb2_is_status_io_timeout, .is_network_name_deleted = smb2_is_network_name_deleted, + .rename_pending_delete = smb2_rename_pending_delete, };struct smb_version_operations smb30_operations = {
@@ -5597,6 +5599,7 @@ struct smb_version_operations smb30_operations = { .llseek = smb3_llseek, .is_status_io_timeout = smb2_is_status_io_timeout, .is_network_name_deleted = smb2_is_network_name_deleted, + .rename_pending_delete = smb2_rename_pending_delete, };struct smb_version_operations smb311_operations = {
@@ -5713,6 +5716,7 @@ struct smb_version_operations smb311_operations = { .llseek = smb3_llseek, .is_status_io_timeout = smb2_is_status_io_timeout, .is_network_name_deleted = smb2_is_network_name_deleted, + .rename_pending_delete = smb2_rename_pending_delete, };#ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY
fs/smb/client/smb2pdu.c +13 -14
@@ -5642,11 +5642,10 @@ SMB2_set_info_free(struct smb_rqst *rqst)cifs_buf_release (rqst->rq_iov[0 ].iov_base);/* request */ } -static int -send_set_info (const unsigned int xid,struct cifs_tcon *tcon, -u64 persistent_fid,u64 volatile_fid,u32 pid,u8 info_class, -u8 info_type,u32 additional_info,unsigned int num, -void **data,unsigned int *size) +int smb2_set_info (const unsigned int xid,struct cifs_tcon *tcon, +u64 persistent_fid,u64 volatile_fid,u32 pid,u8 info_class, +u8 info_type,u32 additional_info,unsigned int num, +void **data,unsigned int *size) {struct smb_rqst rqst;struct smb2_set_info_rsp *rsp =NULL ;
@@ -5730,9 +5729,9 @@ SMB2_set_eof(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,trace_smb3_set_eof (xid, persistent_fid, tcon->tid, tcon->ses->Suid, new_eof); -return send_set_info (xid, tcon, persistent_fid, volatile_fid, - pid,FILE_END_OF_FILE_INFORMATION ,SMB2_O_INFO_FILE , -0 ,1 , &data, &size); +return smb2_set_info (xid, tcon, persistent_fid, volatile_fid, + pid,FILE_END_OF_FILE_INFORMATION ,SMB2_O_INFO_FILE , +0 ,1 , &data, &size); }int
@@ -5740,9 +5739,9 @@ SMB2_set_acl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid, u64 volatile_fid, struct smb_ntsd *pnntsd, int pacllen, int aclflag) { - return send_set_info(xid, tcon, persistent_fid, volatile_fid, - current->tgid, 0, SMB2_O_INFO_SECURITY, aclflag, - 1, (void **)&pnntsd, &pacllen); + return smb2_set_info(xid, tcon, persistent_fid, volatile_fid, + current->tgid, 0, SMB2_O_INFO_SECURITY, aclflag, + 1, (void **)&pnntsd, &pacllen); }int
@@ -5750,9 +5749,9 @@ SMB2_set_ea(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid, u64 volatile_fid, struct smb2_file_full_ea_info *buf, int len) { - return send_set_info(xid, tcon, persistent_fid, volatile_fid, - current->tgid, FILE_FULL_EA_INFORMATION, SMB2_O_INFO_FILE, - 0, 1, (void **)&buf, &len); + return smb2_set_info(xid, tcon, persistent_fid, volatile_fid, + current->tgid, FILE_FULL_EA_INFORMATION, + SMB2_O_INFO_FILE, 0, 1, (void **)&buf, &len); }int
fs/smb/client/smb2proto.h +7 -0
@@ -233,6 +233,10 @@ extern int SMB2_query_directory_init(unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid, u64 volatile_fid, int index, int info_level);extern void SMB2_query_directory_free (struct smb_rqst *rqst); +int smb2_set_info (const unsigned int xid,struct cifs_tcon *tcon, +u64 persistent_fid,u64 volatile_fid,u32 pid,u8 info_class, +u8 info_type,u32 additional_info,unsigned int num, +void **data,unsigned int *size);extern int SMB2_set_eof (const unsigned int xid,struct cifs_tcon *tcon,u64 persistent_fid,u64 volatile_fid,u32 pid,loff_t new_eof);
@@ -317,5 +321,8 @@ int posix_info_sid_size(const void *beg, const void *end);int smb2_make_nfs_node (unsigned int xid,struct inode *inode,struct dentry *dentry,struct cifs_tcon *tcon,const char *full_path,umode_t mode,dev_t dev); +int smb2_rename_pending_delete (const char *full_path, +struct dentry *dentry, +const unsigned int xid);#endif /* _SMB2PROTO_H */
Signature · 1 line
2.51.0
Hi Paulo!
Why not simply fail the rename instead of trying to implement some clever but complex and error prone fallback?
Quoted 485 lines · Paulo Alcantara
Rename of open files in SMB2+ has been broken for a very long time, resulting in data loss as the CIFS client would fail the rename(2) call with
-ENOENTand then removing the target file.Fix this by implementing ->rename_pending_delete() for SMB2+, which will rename busy files to random filenames (e.g. silly rename) during unlink(2) or rename(2), and then marking them to delete-on-close.
Besides, introduce a
FIND_RD_NO_PENDING_DELETEflag forcifs_get_readable_path()to be used insmb2_query_path_info()andsmb2_query_reparse_point()so we don't end up reusing open handles of files that were already removed.Reported-by Jean-Baptiste Denis <[email protected]>Signed-off-by Paulo Alcantara (Red Hat) <[email protected]>Cc Frank Sorenson <[email protected]>Cc Olga Kornievskaia <[email protected]>Cc Benjamin Coddington <[email protected]>Cc Scott Mayhew <[email protected]>---
v1 -> v2:
* Reworked patch to perform the silly rename + delete-pending setting without compounding due to an Azure bug (compound limit of 4?).
* Fixed generic/023 generic/024 generic/035 with SMB2+ against Samba (+posix), Azure, ksmbd, and Windows Server.
* Prevent the client from re-fetching metadata from files that had been marked withCIFS_INO_DELETE_PENDINGor by reusing open handles that have delete pending.fs/smb/client/cifsglob.h | 9 ++- fs/smb/client/file.c | 18 +++++- fs/smb/client/inode.c | 75 +++++++++++++++++----- fs/smb/client/smb2inode.c | 132 ++++++++++++++++++++++++++++++++++++++ fs/smb/client/smb2ops.c | 4 ++ fs/smb/client/smb2pdu.c | 27 ++++---- fs/smb/client/smb2proto.h | 7 ++ 7 files changed, 238 insertions(+), 34 deletions(-)fs/smb/client/cifsglob.h +6
-3@@ -1882,9 +1882,12 @@ static inline bool is_replayable_error(int error)/* cifs_get_writable_file() flags */ -#define FIND_WR_ANY 0 -#define FIND_WR_FSUID_ONLY 1 -#define FIND_WR_WITH_DELETE 2 +enum cifs_writable_file_flags { +FIND_WR_ANY =0U , +FIND_WR_FSUID_ONLY = (1U <<0 ), +FIND_WR_WITH_DELETE = (1U <<1 ), +FIND_WR_NO_PENDING_DELETE = (1U <<2 ), +};#define MID_FREE 0#define MID_REQUEST_ALLOCATED 1fs/smb/client/file.c +17
-1@@ -998,7 +998,10 @@ int cifs_open(struct inode *inode, struct file *file)/* Get the cached handle as SMB2 close is deferred */ if (OPEN_FMODE (file->f_flags) &FMODE_WRITE ) { - rc =cifs_get_writable_path (tcon, full_path,FIND_WR_FSUID_ONLY , &cfile); + rc =cifs_get_writable_path (tcon, full_path, +FIND_WR_FSUID_ONLY | +FIND_WR_NO_PENDING_DELETE , + &cfile); }else { rc =cifs_get_readable_path (tcon, full_path, &cfile); }@@ -2530,6 +2533,9 @@ cifs_get_writable_file(struct cifsInodeInfo *cifs_inode, int flags,continue ;if (with_delete && !(open_file->fid.access &DELETE ))continue ; +if ((flags &FIND_WR_NO_PENDING_DELETE ) && + open_file->status_file_deleted) +continue ;if (OPEN_FMODE (open_file->f_flags) &FMODE_WRITE ) {if (!open_file->invalidHandle) {/* found a good writable file */ @@ -2647,6 +2653,16 @@ cifs_get_readable_path(struct cifs_tcon *tcon, const char *name,spin_unlock (&tcon->open_file_lock);free_dentry_path (page); *ret_file =find_readable_file (cinode,0 ); +if (*ret_file) { +spin_lock (&cinode->open_file_lock); +if ((*ret_file)->status_file_deleted) { +spin_unlock (&cinode->open_file_lock); +cifsFileInfo_put (*ret_file); + *ret_file =NULL ; + }else { +spin_unlock (&cinode->open_file_lock); + } + }return *ret_file ?0 : -ENOENT ; }fs/smb/client/inode.c +59
-16@@ -2003,7 +2003,11 @@ int cifs_unlink(struct inode *dir, struct dentry *dentry) goto psx_del_no_retry; } - rc = server->ops->unlink (xid, tcon, full_path, cifs_sb, dentry); +if (server->vals->protocol_id >SMB10_PROT_ID && +d_is_positive (dentry) &&d_count (dentry) >2 ) + rc = -EBUSY ; +else + rc = server->ops->unlink (xid, tcon, full_path, cifs_sb, dentry); psx_del_no_retry:if (!rc) {@@ -2358,14 +2362,16 @@ int cifs_rmdir(struct inode *inode, struct dentry *direntry) rc = server->ops->rmdir (xid, tcon, full_path, cifs_sb);cifs_put_tlink (tlink); + cifsInode =CIFS_I (d_inode (direntry)); +if (!rc) { +set_bit (CIFS_INO_DELETE_PENDING , &cifsInode->flags);spin_lock (&d_inode (direntry)->i_lock);i_size_write (d_inode (direntry),0 );clear_nlink (d_inode (direntry));spin_unlock (&d_inode (direntry)->i_lock); } - cifsInode =CIFS_I (d_inode (direntry));/* force revalidate to go get info when needed */ cifsInode->time =0 ;@@ -2458,8 +2464,11 @@ cifs_do_rename(const unsigned int xid, struct dentry *from_dentry, }#endif /* CONFIG_CIFS_ALLOW_INSECURE_LEGACY */ do_rename_exit: -if (rc ==0 ) +if (rc ==0 ) {d_move (from_dentry, to_dentry); +/* Force a new lookup */ +d_drop (from_dentry); + }cifs_put_tlink (tlink);return rc; }@@ -2591,19 +2600,51 @@ cifs_rename2(struct mnt_idmap *idmap, struct inode *source_dir, unlink_target:#endif /* CONFIG_CIFS_ALLOW_INSECURE_LEGACY */ - -/* Try unlinking the target dentry if it's not negative */ -if (d_really_is_positive (target_dentry) && (rc == -EACCES || rc == -EEXIST )) { -if (d_is_dir (target_dentry)) - tmprc =cifs_rmdir (target_dir, target_dentry); -else - tmprc =cifs_unlink (target_dir, target_dentry); -if (tmprc) - goto cifs_rename_exit; - rc =cifs_do_rename (xid, source_dentry, from_name, - target_dentry, to_name); -if (!rc) - rehash = false; +if (d_really_is_positive (target_dentry)) { +if (!rc) { +struct inode *inode =d_inode (target_dentry); +/* +* Samba and ksmbd servers allow renaming a target +* directory that is open, so make sure to update +* ->i_nlink and then mark it as delete pending. +*/ +if (S_ISDIR (inode->i_mode)) { +drop_cached_dir_by_name (xid, tcon, to_name, cifs_sb); +spin_lock (&inode->i_lock); +i_size_write (inode,0 ); +clear_nlink (inode); +spin_unlock (&inode->i_lock); +set_bit (CIFS_INO_DELETE_PENDING , &CIFS_I (inode)->flags); +CIFS_I (inode)->time =0 ;/* force reval */ +inode_set_ctime_current (inode); +inode_set_mtime_to_ts (inode,inode_set_ctime_current (inode)); + } + }else if (rc == -EACCES || rc == -EEXIST ) { +/* +* Rename failed, possibly due to a busy target. +* Retry it by unliking the target first. +*/ +if (d_is_dir (target_dentry)) + tmprc =cifs_rmdir (target_dir, target_dentry); +else + tmprc =cifs_unlink (target_dir, target_dentry); +if (tmprc) { +/* +* Some servers will return STATUS_ACCESS_DENIED +* or STATUS_DIRECTORY_NOT_EMPTY when failing to +* rename a non-empty directory. Make sure to +* propagate the appropriate error back to +* userspace. +*/ +if (tmprc == -EEXIST || tmprc == -ENOTEMPTY ) + rc = tmprc; + goto cifs_rename_exit; + } + rc =cifs_do_rename (xid, source_dentry, from_name, + target_dentry, to_name); +if (!rc) + rehash = false; + } }/* force revalidate to go get info when needed */ @@ -2629,6 +2670,8 @@ cifs_dentry_needs_reval(struct dentry *dentry)struct cifs_tcon *tcon =cifs_sb_master_tcon (cifs_sb);struct cached_fid *cfid =NULL ; +if (test_bit (CIFS_INO_DELETE_PENDING , &cifs_i->flags)) +return false;if (cifs_i->time ==0 )return true;fs/smb/client/smb2inode.c +132
-0@@ -1441,3 +1441,135 @@ int smb2_query_reparse_point(const unsigned int xid,cifs_free_open_info (&data);return rc; } + +static inline __le16 *utf16_smb2_path (struct cifs_sb_info *cifs_sb, +const char *name,size_t namelen) +{ +int len; + +if (*name =='\\' || + (cifs_sb_master_tlink (cifs_sb) && +cifs_sb_master_tcon (cifs_sb)->posix_extensions && *name =='/' )) + name++; +return cifs_strndup_to_utf16 (name, namelen, &len, + cifs_sb->local_nls, +cifs_remap (cifs_sb)); +} + +int smb2_rename_pending_delete (const char *full_path, +struct dentry *dentry, +const unsigned int xid) +{ +struct cifs_sb_info *cifs_sb =CIFS_SB (d_inode (dentry)->i_sb); +struct cifsInodeInfo *cinode =CIFS_I (d_inode (dentry)); + __le16 *utf16_from_path __free(kfree) = NULL; + __le16 *utf16_to_path __free(kfree) = NULL; +__u32 co =file_create_options (dentry); +__u8 oplock =SMB2_OPLOCK_LEVEL_NONE ; + char *to_name __free(kfree) = NULL; +__u32 attrs = cinode->cifsAttrs; +struct TCP_Server_Info *server; +struct cifs_open_parms oparms; +static atomic_t sillycounter; +struct tcon_link *tlink; +__u8 delete_pending =1 ; +struct cifs_tcon *tcon; +unsigned int size[2 ]; +struct cifs_fid fid; +const char *ppath; +void *data[2 ]; +void *page; +size_t len; +int rc; + + tlink =cifs_sb_tlink (cifs_sb); +if (IS_ERR (tlink)) +return PTR_ERR (tlink); + tcon =tlink_tcon (tlink); + server = tcon->ses->server; + + page =alloc_dentry_path (); + + ppath =build_path_from_dentry (dentry->d_parent, page); +if (IS_ERR (ppath)) { + rc =PTR_ERR (ppath); + goto out; + } + + len =strlen (ppath) +strlen ("/.__smb1234" ) +1 ; + to_name =kmalloc (len,GFP_KERNEL ); +if (!to_name) { + rc = -ENOMEM ; + goto out; + } + +scnprintf (to_name, len,"%s%c.__smb%04X" , ppath,CIFS_DIR_SEP (cifs_sb), +atomic_inc_return (&sillycounter) &0xffff ); + + utf16_to_path =utf16_smb2_path (cifs_sb, to_name, len); +if (!utf16_to_path) { + rc = -ENOMEM ; + goto out; + } + + utf16_from_path =cifs_convert_path_to_utf16 (full_path, cifs_sb); +if (!utf16_from_path) { + rc = -ENOMEM ; + goto out; + } + +drop_cached_dir_by_name (xid, tcon, full_path, cifs_sb); + oparms =CIFS_OPARMS (cifs_sb, tcon, full_path, +DELETE |FILE_WRITE_ATTRIBUTES , +FILE_OPEN , co,ACL_NO_MODE ); + oparms.fid = &fid; + +if (cinode->lease_granted && server->ops->get_lease_key) { + oplock =SMB2_OPLOCK_LEVEL_LEASE ; + server->ops->get_lease_key (d_inode (dentry), &fid); + } + + rc =SMB2_open (xid, &oparms, utf16_from_path, + &oplock,NULL ,NULL ,NULL ,NULL ); +if (rc) + goto out; + + data[0 ] = &(FILE_BASIC_INFO ) { + .Attributes =cpu_to_le32 ((attrs ?:ATTR_NORMAL ) |ATTR_HIDDEN ), + }; + size[0 ] =sizeof (FILE_BASIC_INFO ); + rc =smb2_set_info (xid, tcon, fid.persistent_fid, fid.volatile_fid, + current->tgid,FILE_BASIC_INFORMATION , +SMB2_O_INFO_FILE ,0 ,1 , data, size); +if (rc) + goto out_close; + + len =sizeof (*utf16_to_path) *UniStrlen ((wchar_t *)utf16_to_path); + data[0 ] = &(struct smb2_file_rename_info_hdr ) { + .ReplaceIfExists =1 , + .FileNameLength =cpu_to_le32 (len), + }; + size[0 ] =sizeof (struct smb2_file_rename_info ); + data[1 ] = utf16_to_path; + size[1 ] = len +sizeof (__le16); + rc =smb2_set_info (xid, tcon, fid.persistent_fid, fid.volatile_fid, + current->tgid,FILE_RENAME_INFORMATION , +SMB2_O_INFO_FILE ,0 ,2 , data, size); +if (rc) + goto out_close; + + data[0 ] = &delete_pending; + size[0 ] =sizeof (delete_pending); + rc =smb2_set_info (xid, tcon, fid.persistent_fid, fid.volatile_fid, + current->tgid,FILE_DISPOSITION_INFORMATION , +SMB2_O_INFO_FILE ,0 ,1 , data, size); +if (!rc) +set_bit (CIFS_INO_DELETE_PENDING , &cinode->flags); + +out_close: +SMB2_close (xid, tcon, fid.persistent_fid, fid.volatile_fid); +out: +cifs_put_tlink (tlink); +free_dentry_path (page); +return rc; +}fs/smb/client/smb2ops.c +4
-0@@ -5376,6 +5376,7 @@ struct smb_version_operations smb20_operations = { .llseek = smb3_llseek, .is_status_io_timeout = smb2_is_status_io_timeout, .is_network_name_deleted = smb2_is_network_name_deleted, + .rename_pending_delete = smb2_rename_pending_delete, };#endif /* CIFS_ALLOW_INSECURE_LEGACY */ @@ -5481,6 +5482,7 @@ struct smb_version_operations smb21_operations = { .llseek = smb3_llseek, .is_status_io_timeout = smb2_is_status_io_timeout, .is_network_name_deleted = smb2_is_network_name_deleted, + .rename_pending_delete = smb2_rename_pending_delete, };struct smb_version_operations smb30_operations = {@@ -5597,6 +5599,7 @@ struct smb_version_operations smb30_operations = { .llseek = smb3_llseek, .is_status_io_timeout = smb2_is_status_io_timeout, .is_network_name_deleted = smb2_is_network_name_deleted, + .rename_pending_delete = smb2_rename_pending_delete, };struct smb_version_operations smb311_operations = {@@ -5713,6 +5716,7 @@ struct smb_version_operations smb311_operations = { .llseek = smb3_llseek, .is_status_io_timeout = smb2_is_status_io_timeout, .is_network_name_deleted = smb2_is_network_name_deleted, + .rename_pending_delete = smb2_rename_pending_delete, };#ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY fs/smb/client/smb2pdu.c +13
-14@@ -5642,11 +5642,10 @@ SMB2_set_info_free(struct smb_rqst *rqst)cifs_buf_release (rqst->rq_iov[0 ].iov_base);/* request */ } -static int -send_set_info (const unsigned int xid,struct cifs_tcon *tcon, -u64 persistent_fid,u64 volatile_fid,u32 pid,u8 info_class, -u8 info_type,u32 additional_info,unsigned int num, -void **data,unsigned int *size) +int smb2_set_info (const unsigned int xid,struct cifs_tcon *tcon, +u64 persistent_fid,u64 volatile_fid,u32 pid,u8 info_class, +u8 info_type,u32 additional_info,unsigned int num, +void **data,unsigned int *size) {struct smb_rqst rqst;struct smb2_set_info_rsp *rsp =NULL ;@@ -5730,9 +5729,9 @@ SMB2_set_eof(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,trace_smb3_set_eof (xid, persistent_fid, tcon->tid, tcon->ses->Suid, new_eof); -return send_set_info (xid, tcon, persistent_fid, volatile_fid, - pid,FILE_END_OF_FILE_INFORMATION ,SMB2_O_INFO_FILE , -0 ,1 , &data, &size); +return smb2_set_info (xid, tcon, persistent_fid, volatile_fid, + pid,FILE_END_OF_FILE_INFORMATION ,SMB2_O_INFO_FILE , +0 ,1 , &data, &size); }int @@ -5740,9 +5739,9 @@ SMB2_set_acl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid, u64 volatile_fid, struct smb_ntsd *pnntsd, int pacllen, int aclflag) { - return send_set_info(xid, tcon, persistent_fid, volatile_fid, - current->tgid, 0, SMB2_O_INFO_SECURITY, aclflag, - 1, (void **)&pnntsd, &pacllen); + return smb2_set_info(xid, tcon, persistent_fid, volatile_fid, + current->tgid, 0, SMB2_O_INFO_SECURITY, aclflag, + 1, (void **)&pnntsd, &pacllen); }int @@ -5750,9 +5749,9 @@ SMB2_set_ea(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid, u64 volatile_fid, struct smb2_file_full_ea_info *buf, int len) { - return send_set_info(xid, tcon, persistent_fid, volatile_fid, - current->tgid, FILE_FULL_EA_INFORMATION, SMB2_O_INFO_FILE, - 0, 1, (void **)&buf, &len); + return smb2_set_info(xid, tcon, persistent_fid, volatile_fid, + current->tgid, FILE_FULL_EA_INFORMATION, + SMB2_O_INFO_FILE, 0, 1, (void **)&buf, &len); }int fs/smb/client/smb2proto.h +7
-0@@ -233,6 +233,10 @@ extern int SMB2_query_directory_init(unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid, u64 volatile_fid, int index, int info_level);extern void SMB2_query_directory_free (struct smb_rqst *rqst); +int smb2_set_info (const unsigned int xid,struct cifs_tcon *tcon, +u64 persistent_fid,u64 volatile_fid,u32 pid,u8 info_class, +u8 info_type,u32 additional_info,unsigned int num, +void **data,unsigned int *size);extern int SMB2_set_eof (const unsigned int xid,struct cifs_tcon *tcon,u64 persistent_fid,u64 volatile_fid,u32 pid,loff_t new_eof);@@ -317,5 +321,8 @@ int posix_info_sid_size(const void *beg, const void *end);int smb2_make_nfs_node (unsigned int xid,struct inode *inode,struct dentry *dentry,struct cifs_tcon *tcon,const char *full_path,umode_t mode,dev_t dev); +int smb2_rename_pending_delete (const char *full_path, +struct dentry *dentry, +const unsigned int xid);#endif /* _SMB2PROTO_H */
A message that is not in the archive (sent off-list or not yet received): CAH2r5mvqJXfgQwKLSWrfBDw8Rc88ys8a_cWB5DtD19HSDmFn5w@mail.gmail.com
Quoted 10 lines · Steve French
On Tue, Sep 2, 2025, 1:57 PM Ralph Boehme <[email protected] <mailto:[email protected]>> wrote:
Hi Paulo!
Why not simply fail the rename instead of trying to implement some clever but complex and error prone fallback?
That would likely break even more (always failing rename on those cases).
Likely? How? Does a Windows client also do this stuff when the rename destination is open? All this additionaly complexity is only waiting for bugs to happen and now that we have POSIX Extensions back we should phase out this crap.
Paulo Alcantara
maintainerQuoted 4 lines · Ralph Boehme
Likely? How? Does a Windows client also do this stuff when the rename destination is open? All this additionaly complexity is only waiting for bugs to happen and now that we have POSIX Extensions back we should phase out this crap.
Claiming POSIX support and being unable to rename open files, that would be even worse, no?
Quoted 9 lines · Paulo Alcantara
Quoted 4 lines · Ralph Boehme
Likely? How? Does a Windows client also do this stuff when the rename destination is open? All this additionaly complexity is only waiting for bugs to happen and now that we have POSIX Extensions back we should phase out this crap.
Claiming POSIX support and being unable to rename open files, that would be even worse, no?
with SMB3 POSIX support all this just works including renames, what are you alluding to?
Paulo Alcantara
maintainerQuoted 8 lines · Ralph Boehme
Quoted 7 lines · Paulo Alcantara
Quoted 4 lines · Ralph Boehme
Likely? How? Does a Windows client also do this stuff when the rename destination is open? All this additionaly complexity is only waiting for bugs to happen and now that we have POSIX Extensions back we should phase out this crap.
Quoted 5 lines
Quoted 2 lines
Claiming POSIX support and being unable to rename open files, that would be even worse, no?
with SMB3 POSIX support all this just works including renames, what are you alluding to?
What I mean is renaming *open files*, which is currently broken in cifs.ko for SMB2+. IMHO, anyone using something that mentions POSIX support would expect renaming open files just work like in any UNIX enviroment.
The protocol allows us to implement such thing, so why not doing it? If you want to us to return -EBUSY when attempting to rename open files, then we should mention it to the users to keep using SMB1 to have such fundamental behavior working.
Quoted 10 lines · Paulo Alcantara
Quoted 8 lines · Ralph Boehme
Quoted 7 lines · Paulo Alcantara
Quoted 4 lines · Ralph Boehme
Likely? How? Does a Windows client also do this stuff when the rename destination is open? All this additionaly complexity is only waiting for bugs to happen and now that we have POSIX Extensions back we should phase out this crap.
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
Claiming POSIX support and being unable to rename open files, that would be even worse, no?
with SMB3 POSIX support all this just works including renames, what are you alluding to?
What I mean is renaming *open files*, which is currently broken in cifs.ko for SMB2+.
sure, this works in the protocol and should work in any reasonable client.
Paulo Alcantara
maintainerHi Ralph,
Quoted 2 lines · Ralph Boehme
Why not simply fail the rename instead of trying to implement some clever but complex and error prone fallback?
We're doing this for SMB1 for a very long time and haven't heard of any issues so far. I've got a "safer" version [1] that does everything a single compound request but then implemented this non-compound version due to an existing Azure bug that seems to limit the compound in 4 commands, AFAICT. Most applications depend on such behavior working, which is renaming open files.
Once we rename the file and then mark it as delete pending, what other problems do you have in mind that we might have?
Hi Paulo,
Quoted 11 lines · Paulo Alcantara
Quoted 2 lines · Ralph Boehme
Why not simply fail the rename instead of trying to implement some clever but complex and error prone fallback?
We're doing this for SMB1 for a very long time and haven't heard of any issues so far. I've got a "safer" version [1] that does everything a single compound request but then implemented this non-compound version due to an existing Azure bug that seems to limit the compound in 4 commands, AFAICT. Most applications depend on such behavior working, which is renaming open files.
maybe I'm barking of the wrong tree, but you *can* rename open files:
$ bin/smbclient -U 'USER%PASS' //IP/C\$ smb: \> cd Users\administrator.WINCLUSTER\Desktop\ smb: \Users\administrator.WINCLUSTER\Desktop\> open t-ph-oplock-b-downgraded-s.cab open file \Users\administrator.WINCLUSTER\Desktop\t-ph-oplock-b-downgraded-s.cab: for read/write fnum 1 smb: \Users\administrator.WINCLUSTER\Desktop\> rename t-ph-oplock-b-downgraded-s.cab renamed smb: \Users\administrator.WINCLUSTER\Desktop\>
...given the open is with SHARE_DELETE (had to tweak smbclient to actually allow that).
If the rename destination is open and the server rightly fails the rename for that reason, then masking that error is a mistake imho.
When doing
$ mv a b
the user asked to rename a, he did NOT ask to rename b which becomes important, because if you do
rename("b", ".renamehackXXXX")
under the hood and then reattempt the rename
rename("a", "b")
and then the user subsequently does
$ mv b .. $ cd .. $ rmdir DIR
where DIR is the directory all of the above was performed inside, the rmdir will fail with ENOTEMPTY and *now* the user is confused.
Paulo Alcantara
maintainerQuoted 28 lines · Ralph Boehme
Hi Paulo,
Quoted 11 lines · Paulo Alcantara
Quoted 2 lines · Ralph Boehme
Why not simply fail the rename instead of trying to implement some clever but complex and error prone fallback?
We're doing this for SMB1 for a very long time and haven't heard of any issues so far. I've got a "safer" version [1] that does everything a single compound request but then implemented this non-compound version due to an existing Azure bug that seems to limit the compound in 4 commands, AFAICT. Most applications depend on such behavior working, which is renaming open files.
maybe I'm barking of the wrong tree, but you *can* rename open files:
$ bin/smbclient -U 'USER%PASS' //IP/C\$ smb: \> cd Users\administrator.WINCLUSTER\Desktop\ smb: \Users\administrator.WINCLUSTER\Desktop\> open t-ph-oplock-b-downgraded-s.cab open file \Users\administrator.WINCLUSTER\Desktop\t-ph-oplock-b-downgraded-s.cab: for read/write fnum 1 smb: \Users\administrator.WINCLUSTER\Desktop\> rename t-ph-oplock-b-downgraded-s.cab renamed smb: \Users\administrator.WINCLUSTER\Desktop\>
Quoted 2 lines
...given the open is with
SHARE_DELETE(had to tweak smbclient to actually allow that).
Interesting.
cifs.ko will get STATUS_ACCESS_DENIED when attempting to rename the open file. The file was open with SHARE_READ|SHARE_WRITE|SHARE_DELETE, BTW.
Also, note that cifs.ko will not reuse the open handle, rather it will send a compound request of create+set_info(rename)+close to the file which will fail with STATUS_ACCESS_DENIED.
What am I missing?
Quoted 16 lines
If the rename destination is open and the server rightly fails the rename for that reason, then masking that error is a mistake imho.
When doing
$ mv a bthe user asked to rename a, he did NOT ask to rename b which becomes important, because if you do
rename("b", ".renamehackXXXX")under the hood and then reattempt the rename
rename("a", "b")
Quoted 8 lines
and then the user subsequently does
$ mv b .. $ cd .. $ rmdir DIRwhere DIR is the directory all of the above was performed inside, the rmdir will fail with ENOTEMPTY and *now* the user is confused.
Yes, I understand your point. That's really confusing.
How can we resolve above cases without performing the silly renames then?
ronnie sahlberg
reviewerQuoted 67 lines · Paulo Alcantara
Quoted 28 lines · Ralph Boehme
Hi Paulo,
Quoted 11 lines · Paulo Alcantara
Quoted 2 lines · Ralph Boehme
Why not simply fail the rename instead of trying to implement some clever but complex and error prone fallback?
We're doing this for SMB1 for a very long time and haven't heard of any issues so far. I've got a "safer" version [1] that does everything a single compound request but then implemented this non-compound version due to an existing Azure bug that seems to limit the compound in 4 commands, AFAICT. Most applications depend on such behavior working, which is renaming open files.
maybe I'm barking of the wrong tree, but you *can* rename open files:
$ bin/smbclient -U 'USER%PASS' //IP/C\$ smb: \> cd Users\administrator.WINCLUSTER\Desktop\ smb: \Users\administrator.WINCLUSTER\Desktop\> open t-ph-oplock-b-downgraded-s.cab open file \Users\administrator.WINCLUSTER\Desktop\t-ph-oplock-b-downgraded-s.cab: for read/write fnum 1 smb: \Users\administrator.WINCLUSTER\Desktop\> rename t-ph-oplock-b-downgraded-s.cab renamed smb: \Users\administrator.WINCLUSTER\Desktop\>Quoted 2 lines
...given the open is with
SHARE_DELETE(had to tweak smbclient to actually allow that).Interesting.
cifs.ko will get
STATUS_ACCESS_DENIEDwhen attempting to rename the open file. The file was open with SHARE_READ|SHARE_WRITE|SHARE_DELETE, BTW.Also, note that cifs.ko will not reuse the open handle, rather it will send a compound request of create+set_info(rename)+close to the file which will fail with
STATUS_ACCESS_DENIED.What am I missing?
Quoted 22 lines
If the rename destination is open and the server rightly fails the rename for that reason, then masking that error is a mistake imho.
When doing
$ mv a bthe user asked to rename a, he did NOT ask to rename b which becomes important, because if you do
rename("b", ".renamehackXXXX")under the hood and then reattempt the rename
rename("a", "b")and then the user subsequently does
$ mv b .. $ cd .. $ rmdir DIR
Quoted 8 lines
Quoted 2 lines
where DIR is the directory all of the above was performed inside, the rmdir will fail with ENOTEMPTY and *now* the user is confused.
Yes, I understand your point. That's really confusing.
How can we resolve above cases without performing the silly renames then?
I think you can't. CIFS, without the posix extensions, is basically not posix and never will be.
You can make it close but it will never be perfect and you will have to decide on how/what posix semantics you need to give up.
What compounds the issue is that cifs on linux (without the posix extensions) will also always be a second class citizen. Genuine windows clients own this protocol and they expect their own non-posix semantics for their vfs, so you can't do anything that impacts windows clients, they are the first class citizen here.
The two main issues I see with the silly renames are the "-ENOTEMPTY" error when trying to delete the "empty" directory, but also that you can not hide them from windows clients. And what happens if the windows clients start accessing them?
I think the only real solution is to say "if you need posix semantics then you need to use the posix extensions".
ronnie sahlberg
reviewerQuoted 89 lines · ronnie sahlberg
Quoted 67 lines · Paulo Alcantara
Quoted 28 lines · Ralph Boehme
Hi Paulo,
Quoted 11 lines · Paulo Alcantara
Quoted 2 lines · Ralph Boehme
Why not simply fail the rename instead of trying to implement some clever but complex and error prone fallback?
We're doing this for SMB1 for a very long time and haven't heard of any issues so far. I've got a "safer" version [1] that does everything a single compound request but then implemented this non-compound version due to an existing Azure bug that seems to limit the compound in 4 commands, AFAICT. Most applications depend on such behavior working, which is renaming open files.
maybe I'm barking of the wrong tree, but you *can* rename open files:
$ bin/smbclient -U 'USER%PASS' //IP/C\$ smb: \> cd Users\administrator.WINCLUSTER\Desktop\ smb: \Users\administrator.WINCLUSTER\Desktop\> open t-ph-oplock-b-downgraded-s.cab open file \Users\administrator.WINCLUSTER\Desktop\t-ph-oplock-b-downgraded-s.cab: for read/write fnum 1 smb: \Users\administrator.WINCLUSTER\Desktop\> rename t-ph-oplock-b-downgraded-s.cab renamed smb: \Users\administrator.WINCLUSTER\Desktop\>Quoted 2 lines
...given the open is with
SHARE_DELETE(had to tweak smbclient to actually allow that).Interesting.
cifs.ko will get
STATUS_ACCESS_DENIEDwhen attempting to rename the open file. The file was open with SHARE_READ|SHARE_WRITE|SHARE_DELETE, BTW.Also, note that cifs.ko will not reuse the open handle, rather it will send a compound request of create+set_info(rename)+close to the file which will fail with
STATUS_ACCESS_DENIED.What am I missing?
Quoted 22 lines
If the rename destination is open and the server rightly fails the rename for that reason, then masking that error is a mistake imho.
When doing
$ mv a bthe user asked to rename a, he did NOT ask to rename b which becomes important, because if you do
rename("b", ".renamehackXXXX")under the hood and then reattempt the rename
rename("a", "b")and then the user subsequently does
$ mv b .. $ cd .. $ rmdir DIRQuoted 8 lines
Quoted 2 lines
where DIR is the directory all of the above was performed inside, the rmdir will fail with ENOTEMPTY and *now* the user is confused.
Yes, I understand your point. That's really confusing.
How can we resolve above cases without performing the silly renames then?
I think you can't. CIFS, without the posix extensions, is basically not posix and never will be.
You can make it close but it will never be perfect and you will have to decide on how/what posix semantics you need to give up.What compounds the issue is that cifs on linux (without the posix extensions) will also always be a second class citizen. Genuine windows clients own this protocol and they expect their own non-posix semantics for their vfs, so you can't do anything that impacts windows clients, they are the first class citizen here.
Quoted 7 lines
The two main issues I see with the silly renames are the "
-ENOTEMPTY" error when trying to delete the "empty" directory, but also that you can not hide them from windows clients. And what happens if the windows clients start accessing them?I think the only real solution is to say "if you need posix semantics then you need to use the posix extensions".
Another potential issue is about QUERY_INFO.
Many of the information classes in FSCC return the filename as as part of the data.
What filename should be returned for a silly renamed file?
Maybe it doesn't matter but maybe there is some obscure windows application out there that do care and gets surprised.
Paulo Alcantara
maintainerQuoted 98 lines · ronnie sahlberg
Quoted 89 lines · ronnie sahlberg
Quoted 67 lines · Paulo Alcantara
Quoted 28 lines · Ralph Boehme
Hi Paulo,
Quoted 11 lines · Paulo Alcantara
Quoted 2 lines · Ralph Boehme
Why not simply fail the rename instead of trying to implement some clever but complex and error prone fallback?
We're doing this for SMB1 for a very long time and haven't heard of any issues so far. I've got a "safer" version [1] that does everything a single compound request but then implemented this non-compound version due to an existing Azure bug that seems to limit the compound in 4 commands, AFAICT. Most applications depend on such behavior working, which is renaming open files.
maybe I'm barking of the wrong tree, but you *can* rename open files:
$ bin/smbclient -U 'USER%PASS' //IP/C\$ smb: \> cd Users\administrator.WINCLUSTER\Desktop\ smb: \Users\administrator.WINCLUSTER\Desktop\> open t-ph-oplock-b-downgraded-s.cab open file \Users\administrator.WINCLUSTER\Desktop\t-ph-oplock-b-downgraded-s.cab: for read/write fnum 1 smb: \Users\administrator.WINCLUSTER\Desktop\> rename t-ph-oplock-b-downgraded-s.cab renamed smb: \Users\administrator.WINCLUSTER\Desktop\>Quoted 2 lines
...given the open is with
SHARE_DELETE(had to tweak smbclient to actually allow that).Interesting.
cifs.ko will get
STATUS_ACCESS_DENIEDwhen attempting to rename the open file. The file was open with SHARE_READ|SHARE_WRITE|SHARE_DELETE, BTW.Also, note that cifs.ko will not reuse the open handle, rather it will send a compound request of create+set_info(rename)+close to the file which will fail with
STATUS_ACCESS_DENIED.What am I missing?
Quoted 22 lines
If the rename destination is open and the server rightly fails the rename for that reason, then masking that error is a mistake imho.
When doing
$ mv a bthe user asked to rename a, he did NOT ask to rename b which becomes important, because if you do
rename("b", ".renamehackXXXX")under the hood and then reattempt the rename
rename("a", "b")and then the user subsequently does
$ mv b .. $ cd .. $ rmdir DIRQuoted 8 lines
Quoted 2 lines
where DIR is the directory all of the above was performed inside, the rmdir will fail with ENOTEMPTY and *now* the user is confused.
Yes, I understand your point. That's really confusing.
How can we resolve above cases without performing the silly renames then?
I think you can't. CIFS, without the posix extensions, is basically not posix and never will be.
You can make it close but it will never be perfect and you will have to decide on how/what posix semantics you need to give up.What compounds the issue is that cifs on linux (without the posix extensions) will also always be a second class citizen. Genuine windows clients own this protocol and they expect their own non-posix semantics for their vfs, so you can't do anything that impacts windows clients, they are the first class citizen here.
Quoted 7 lines
The two main issues I see with the silly renames are the "
-ENOTEMPTY" error when trying to delete the "empty" directory, but also that you can not hide them from windows clients. And what happens if the windows clients start accessing them?I think the only real solution is to say "if you need posix semantics then you need to use the posix extensions".
Quoted 7 lines
Another potential issue is about
QUERY_INFO.
Many of the information classes in FSCC return the filename as as part of the data.
What filename should be returned for a silly renamed file?Maybe it doesn't matter but maybe there is some obscure windows application out there that do care and gets surprised.
I don't think that matters as file deletion is pending on the server and QUERY_INFO won't work.
What am I missing?
ronnie sahlberg
reviewerQuoted 106 lines · Paulo Alcantara
Quoted 103 lines · ronnie sahlberg
Quoted 89 lines · ronnie sahlberg
Quoted 67 lines · Paulo Alcantara
Quoted 28 lines · Ralph Boehme
Hi Paulo,
Quoted 11 lines · Paulo Alcantara
Quoted 2 lines · Ralph Boehme
Why not simply fail the rename instead of trying to implement some clever but complex and error prone fallback?
We're doing this for SMB1 for a very long time and haven't heard of any issues so far. I've got a "safer" version [1] that does everything a single compound request but then implemented this non-compound version due to an existing Azure bug that seems to limit the compound in 4 commands, AFAICT. Most applications depend on such behavior working, which is renaming open files.
maybe I'm barking of the wrong tree, but you *can* rename open files:
$ bin/smbclient -U 'USER%PASS' //IP/C\$ smb: \> cd Users\administrator.WINCLUSTER\Desktop\ smb: \Users\administrator.WINCLUSTER\Desktop\> open t-ph-oplock-b-downgraded-s.cab open file \Users\administrator.WINCLUSTER\Desktop\t-ph-oplock-b-downgraded-s.cab: for read/write fnum 1 smb: \Users\administrator.WINCLUSTER\Desktop\> rename t-ph-oplock-b-downgraded-s.cab renamed smb: \Users\administrator.WINCLUSTER\Desktop\>Quoted 2 lines
...given the open is with
SHARE_DELETE(had to tweak smbclient to actually allow that).Interesting.
cifs.ko will get
STATUS_ACCESS_DENIEDwhen attempting to rename the open file. The file was open with SHARE_READ|SHARE_WRITE|SHARE_DELETE, BTW.Also, note that cifs.ko will not reuse the open handle, rather it will send a compound request of create+set_info(rename)+close to the file which will fail with
STATUS_ACCESS_DENIED.What am I missing?
Quoted 22 lines
If the rename destination is open and the server rightly fails the rename for that reason, then masking that error is a mistake imho.
When doing
$ mv a bthe user asked to rename a, he did NOT ask to rename b which becomes important, because if you do
rename("b", ".renamehackXXXX")under the hood and then reattempt the rename
rename("a", "b")and then the user subsequently does
$ mv b .. $ cd .. $ rmdir DIRQuoted 8 lines
Quoted 2 lines
where DIR is the directory all of the above was performed inside, the rmdir will fail with ENOTEMPTY and *now* the user is confused.
Yes, I understand your point. That's really confusing.
How can we resolve above cases without performing the silly renames then?
I think you can't. CIFS, without the posix extensions, is basically not posix and never will be.
You can make it close but it will never be perfect and you will have to decide on how/what posix semantics you need to give up.What compounds the issue is that cifs on linux (without the posix extensions) will also always be a second class citizen. Genuine windows clients own this protocol and they expect their own non-posix semantics for their vfs, so you can't do anything that impacts windows clients, they are the first class citizen here.
Quoted 7 lines
The two main issues I see with the silly renames are the "
-ENOTEMPTY" error when trying to delete the "empty" directory, but also that you can not hide them from windows clients. And what happens if the windows clients start accessing them?I think the only real solution is to say "if you need posix semantics then you need to use the posix extensions".
Another potential issue is about
QUERY_INFO.
Many of the information classes in FSCC return the filename as as part of the data.
What filename should be returned for a silly renamed file?
Quoted 7 lines
Quoted 2 lines
Maybe it doesn't matter but maybe there is some obscure windows application out there that do care and gets surprised.
I don't think that matters as file deletion is pending on the server and
QUERY_INFOwon't work.What am I missing?
You missed nothing. I didn't think it through.
But another potential issue is the possibility of a DOS from malicious windows clients.
If the files are "hidden" from linux clients.
How would a linux client recover if a maliciious windows client just creates an ordinary file with a filename that matches the "silly rename prefix".
The file can not be seen or deleted from linux clients and thus the directory becomes undeletable too?
Paulo Alcantara
maintainerQuoted 117 lines · ronnie sahlberg
Quoted 106 lines · Paulo Alcantara
Quoted 103 lines · ronnie sahlberg
Quoted 89 lines · ronnie sahlberg
Quoted 67 lines · Paulo Alcantara
Quoted 28 lines · Ralph Boehme
Hi Paulo,
Quoted 11 lines · Paulo Alcantara
Quoted 2 lines · Ralph Boehme
Why not simply fail the rename instead of trying to implement some clever but complex and error prone fallback?
We're doing this for SMB1 for a very long time and haven't heard of any issues so far. I've got a "safer" version [1] that does everything a single compound request but then implemented this non-compound version due to an existing Azure bug that seems to limit the compound in 4 commands, AFAICT. Most applications depend on such behavior working, which is renaming open files.
maybe I'm barking of the wrong tree, but you *can* rename open files:
$ bin/smbclient -U 'USER%PASS' //IP/C\$ smb: \> cd Users\administrator.WINCLUSTER\Desktop\ smb: \Users\administrator.WINCLUSTER\Desktop\> open t-ph-oplock-b-downgraded-s.cab open file \Users\administrator.WINCLUSTER\Desktop\t-ph-oplock-b-downgraded-s.cab: for read/write fnum 1 smb: \Users\administrator.WINCLUSTER\Desktop\> rename t-ph-oplock-b-downgraded-s.cab renamed smb: \Users\administrator.WINCLUSTER\Desktop\>Quoted 2 lines
...given the open is with
SHARE_DELETE(had to tweak smbclient to actually allow that).Interesting.
cifs.ko will get
STATUS_ACCESS_DENIEDwhen attempting to rename the open file. The file was open with SHARE_READ|SHARE_WRITE|SHARE_DELETE, BTW.Also, note that cifs.ko will not reuse the open handle, rather it will send a compound request of create+set_info(rename)+close to the file which will fail with
STATUS_ACCESS_DENIED.What am I missing?
Quoted 22 lines
If the rename destination is open and the server rightly fails the rename for that reason, then masking that error is a mistake imho.
When doing
$ mv a bthe user asked to rename a, he did NOT ask to rename b which becomes important, because if you do
rename("b", ".renamehackXXXX")under the hood and then reattempt the rename
rename("a", "b")and then the user subsequently does
$ mv b .. $ cd .. $ rmdir DIRQuoted 8 lines
Quoted 2 lines
where DIR is the directory all of the above was performed inside, the rmdir will fail with ENOTEMPTY and *now* the user is confused.
Yes, I understand your point. That's really confusing.
How can we resolve above cases without performing the silly renames then?
I think you can't. CIFS, without the posix extensions, is basically not posix and never will be.
You can make it close but it will never be perfect and you will have to decide on how/what posix semantics you need to give up.What compounds the issue is that cifs on linux (without the posix extensions) will also always be a second class citizen. Genuine windows clients own this protocol and they expect their own non-posix semantics for their vfs, so you can't do anything that impacts windows clients, they are the first class citizen here.
Quoted 7 lines
The two main issues I see with the silly renames are the "
-ENOTEMPTY" error when trying to delete the "empty" directory, but also that you can not hide them from windows clients. And what happens if the windows clients start accessing them?I think the only real solution is to say "if you need posix semantics then you need to use the posix extensions".
Another potential issue is about
QUERY_INFO.
Many of the information classes in FSCC return the filename as as part of the data.
What filename should be returned for a silly renamed file?Quoted 7 lines
Quoted 2 lines
Maybe it doesn't matter but maybe there is some obscure windows application out there that do care and gets surprised.
I don't think that matters as file deletion is pending on the server and
QUERY_INFOwon't work.What am I missing?
You missed nothing. I didn't think it through.
Quoted 8 lines
But another potential issue is the possibility of a DOS from malicious windows clients.
If the files are "hidden" from linux clients.
How would a linux client recover if a maliciious windows client just creates an ordinary file with a filename that matches the "silly rename prefix".
The file can not be seen or deleted from linux clients and thus the directory becomes undeletable too?
Yes, that's a good point. Thanks!
One way to solve that would be doing something similar as AFS currently does, which is finding the next non-existing silly filename that could used by calling lookup_noperm() and then incrementing @sillycounter until it gets the first negative dentry.
Paulo Alcantara
maintainerQuoted 73 lines · ronnie sahlberg
Quoted 72 lines · Paulo Alcantara
Quoted 28 lines · Ralph Boehme
Hi Paulo,
Quoted 11 lines · Paulo Alcantara
Quoted 2 lines · Ralph Boehme
Why not simply fail the rename instead of trying to implement some clever but complex and error prone fallback?
We're doing this for SMB1 for a very long time and haven't heard of any issues so far. I've got a "safer" version [1] that does everything a single compound request but then implemented this non-compound version due to an existing Azure bug that seems to limit the compound in 4 commands, AFAICT. Most applications depend on such behavior working, which is renaming open files.
maybe I'm barking of the wrong tree, but you *can* rename open files:
$ bin/smbclient -U 'USER%PASS' //IP/C\$ smb: \> cd Users\administrator.WINCLUSTER\Desktop\ smb: \Users\administrator.WINCLUSTER\Desktop\> open t-ph-oplock-b-downgraded-s.cab open file \Users\administrator.WINCLUSTER\Desktop\t-ph-oplock-b-downgraded-s.cab: for read/write fnum 1 smb: \Users\administrator.WINCLUSTER\Desktop\> rename t-ph-oplock-b-downgraded-s.cab renamed smb: \Users\administrator.WINCLUSTER\Desktop\>Quoted 2 lines
...given the open is with
SHARE_DELETE(had to tweak smbclient to actually allow that).Interesting.
cifs.ko will get
STATUS_ACCESS_DENIEDwhen attempting to rename the open file. The file was open with SHARE_READ|SHARE_WRITE|SHARE_DELETE, BTW.Also, note that cifs.ko will not reuse the open handle, rather it will send a compound request of create+set_info(rename)+close to the file which will fail with
STATUS_ACCESS_DENIED.What am I missing?
Quoted 16 lines
If the rename destination is open and the server rightly fails the rename for that reason, then masking that error is a mistake imho.
When doing
$ mv a bthe user asked to rename a, he did NOT ask to rename b which becomes important, because if you do
rename("b", ".renamehackXXXX")under the hood and then reattempt the rename
rename("a", "b")Quoted 8 lines
and then the user subsequently does
$ mv b .. $ cd .. $ rmdir DIRwhere DIR is the directory all of the above was performed inside, the rmdir will fail with ENOTEMPTY and *now* the user is confused.
Yes, I understand your point. That's really confusing.
Quoted 8 lines
Quoted 3 lines
How can we resolve above cases without performing the silly renames then?
I think you can't. CIFS, without the posix extensions, is basically not posix and never will be.
You can make it close but it will never be perfect and you will have to decide on how/what posix semantics you need to give up.
Agreed.
Quoted 5 lines
What compounds the issue is that cifs on linux (without the posix extensions) will also always be a second class citizen. Genuine windows clients own this protocol and they expect their own non-posix semantics for their vfs, so you can't do anything that impacts windows clients, they are the first class citizen here.
Yep.
Quoted 4 lines
The two main issues I see with the silly renames are the "
-ENOTEMPTY" error when trying to delete the "empty" directory, but also that you can not hide them from windows clients. And what happens if the windows clients start accessing them?
Any potential concurrent opens on the silly-renamed file will fail with STATUS_DELETE_PENDING.
Quoted 2 lines
I think the only real solution is to say "if you need posix semantics then you need to use the posix extensions".
If they expect *full* POSIX semantics, yes, that makes sense. But if the protocol allows implementing part of it, why not doing it?
Paulo Alcantara
maintainerQuoted 2 lines · Ralph Boehme
where DIR is the directory all of the above was performed inside, the rmdir will fail with ENOTEMPTY and *now* the user is confused.
BTW, it is not only a CIFS problem as AFS and NFS that have been doing these silly renames forever, they would also fail with -ENOTEMPTY.
If you know a way to resolve that without expecting the server to support unliked file retention, then please let me know.
A message that is not in the archive (sent off-list or not yet received): notmuch-sha1-4fd369d43684b0739d61e9e931e63ca8c7e2a82c
Paulo Alcantara
maintainerQuoted 6 lines · Paulo Alcantara
We're doing this for SMB1 for a very long time and haven't heard of any issues so far. I've got a "safer" version [1] that does everything a single compound request but then implemented this non-compound version due to an existing Azure bug that seems to limit the compound in 4 commands, AFAICT. Most applications depend on such behavior working, which is renaming open files.
[1] https://git.manguebit.org/linux.git/commit/?h=cifs.rename