smb/client: fix incorrect nlink returned by fstat()
Subsystems (2)
ChenXiaoSong
reviewerv4 cover smb/client: fix incorrect nlink returned by fstat()
From: ChenXiaoSong <[email protected]>
v3->v4:
- Add patch #01 #02
- Patch #03: add cf_flags to struct cifs_open_info_data
v3: https://lore.kernel.org/linux-cifs/[email protected]/
ChenXiaoSong (3):
smb/client: use stack-allocated smb2_file_all_info in
smb3_query_mf_symlink()
smb/client: pass cifs_open_info_data to SMB2_open() smb/client: fix incorrect nlink returned by fstat()
fs/smb/client/cifsglob.h | 1 + fs/smb/client/inode.c | 1 + fs/smb/client/link.c | 15 +++------------ fs/smb/client/smb2file.c | 19 ++++++++----------- fs/smb/client/smb2pdu.c | 26 ++++++++++++++------------ fs/smb/client/smb2proto.h | 2 +- 6 files changed, 28 insertions(+), 36 deletions(-)
Signature · 1 line
2.54.0
ChenXiaoSong
reviewerPATCH v4 1/3 smb/client: use stack-allocated smb2_file_all_info in smb3_query_mf_symlink()
From: ChenXiaoSong <[email protected]>
SMB2_open() only fills the fixed fields, so a stack-allocated smb2_file_all_info is sufficient here.
--- fs/smb/client/link.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-)
fs/smb/client/link.c +3 -12
@@ -320,7 +320,7 @@ smb3_query_mf_symlink(unsigned int xid, struct cifs_tcon *tcon,int buf_type =CIFS_NO_BUFFER ;__le16 *utf16_path;__u8 oplock =SMB2_OPLOCK_LEVEL_NONE ; -struct smb2_file_all_info *pfile_info =NULL ; +struct smb2_file_all_info file_info = {}; oparms = (struct cifs_open_parms ) { .tcon = tcon,
@@ -336,20 +336,12 @@ smb3_query_mf_symlink(unsigned int xid, struct cifs_tcon *tcon,if (utf16_path ==NULL )return -ENOMEM ; - pfile_info =kzalloc (sizeof (struct smb2_file_all_info ) +PATH_MAX *2 , -GFP_KERNEL ); - -if (pfile_info ==NULL ) { -kfree (utf16_path); -return -ENOMEM ; - } - - rc =SMB2_open (xid, &oparms, utf16_path, &oplock, pfile_info,NULL , + rc =SMB2_open (xid, &oparms, utf16_path, &oplock, &file_info,NULL ,NULL ,NULL );if (rc) goto qmf_out_open_fail; -if (pfile_info->EndOfFile !=cpu_to_le64 (CIFS_MF_SYMLINK_FILE_SIZE )) { +if (file_info.EndOfFile !=cpu_to_le64 (CIFS_MF_SYMLINK_FILE_SIZE )) {/* it's not a symlink */ rc = -ENOENT ;/* Is there a better rc to return? */ goto qmf_out;
@@ -367,7 +359,6 @@ smb3_query_mf_symlink(unsigned int xid, struct cifs_tcon *tcon,SMB2_close (xid, tcon, fid.persistent_fid, fid.volatile_fid); qmf_out_open_fail:kfree (utf16_path); -kfree (pfile_info);return rc; }
Signature · 1 line
2.54.0
ChenXiaoSong
reviewerPATCH v4 2/3 smb/client: pass cifs_open_info_data to SMB2_open()
In reply to ChenXiaoSongFrom: ChenXiaoSong <[email protected]>
Let SMB2_open() fill the smb2_file_all_info embedded in cifs_open_info_data directly. This removes the temporary smb2_file_all_info copy in smb2_open_file().
--- fs/smb/client/link.c | 6 +++--- fs/smb/client/smb2file.c | 19 ++++++++----------- fs/smb/client/smb2pdu.c | 25 +++++++++++++------------ fs/smb/client/smb2proto.h | 2 +- 4 files changed, 25 insertions(+), 27 deletions(-)
fs/smb/client/link.c +3 -3
@@ -320,7 +320,7 @@ smb3_query_mf_symlink(unsigned int xid, struct cifs_tcon *tcon,int buf_type =CIFS_NO_BUFFER ;__le16 *utf16_path;__u8 oplock =SMB2_OPLOCK_LEVEL_NONE ; -struct smb2_file_all_info file_info = {}; +struct cifs_open_info_data data = {}; oparms = (struct cifs_open_parms ) { .tcon = tcon,
@@ -336,12 +336,12 @@ smb3_query_mf_symlink(unsigned int xid, struct cifs_tcon *tcon,if (utf16_path ==NULL )return -ENOMEM ; - rc =SMB2_open (xid, &oparms, utf16_path, &oplock, &file_info,NULL , + rc =SMB2_open (xid, &oparms, utf16_path, &oplock, &data,NULL ,NULL ,NULL );if (rc) goto qmf_out_open_fail; -if (file_info.EndOfFile !=cpu_to_le64 (CIFS_MF_SYMLINK_FILE_SIZE )) { +if (data.fi.EndOfFile !=cpu_to_le64 (CIFS_MF_SYMLINK_FILE_SIZE )) {/* it's not a symlink */ rc = -ENOENT ;/* Is there a better rc to return? */ goto qmf_out;
fs/smb/client/smb2file.c +8 -11
@@ -154,8 +154,6 @@ int smb2_open_file(const unsigned int xid, struct cifs_open_parms *oparms,__le16 *smb2_path;__u8 smb2_oplock;struct cifs_open_info_data *data = buf; -struct smb2_file_all_info file_info = {}; -struct smb2_file_all_info *smb2_data = data ? &file_info :NULL ;struct kvec err_iov = {};int err_buftype =CIFS_NO_BUFFER ;struct cifs_fid *fid = oparms->fid;
@@ -182,14 +180,14 @@ int smb2_open_file(const unsigned int xid, struct cifs_open_parms *oparms, } smb2_oplock =SMB2_OPLOCK_LEVEL_BATCH ; - rc =SMB2_open (xid, oparms, smb2_path, &smb2_oplock, smb2_data,NULL , &err_iov, + rc =SMB2_open (xid, oparms, smb2_path, &smb2_oplock, data,NULL , &err_iov, &err_buftype);if (rc == -EACCES && retry_without_read_attributes) {free_rsp_buf (err_buftype, err_iov.iov_base);memset (&err_iov,0 ,sizeof (err_iov)); err_buftype =CIFS_NO_BUFFER ; oparms->desired_access &= ~FILE_READ_ATTRIBUTES ; - rc =SMB2_open (xid, oparms, smb2_path, &smb2_oplock, smb2_data,NULL , &err_iov, + rc =SMB2_open (xid, oparms, smb2_path, &smb2_oplock, data,NULL , &err_iov, &err_buftype); }if (rc && data) {
@@ -202,9 +200,9 @@ int smb2_open_file(const unsigned int xid, struct cifs_open_parms *oparms, oparms->path, &data->symlink_target);if (!rc) { -memset (smb2_data,0 ,sizeof (*smb2_data)); +memset (&data->fi,0 ,sizeof (data->fi)); oparms->create_options |=OPEN_REPARSE_POINT ; - rc =SMB2_open (xid, oparms, smb2_path, &smb2_oplock, smb2_data, + rc =SMB2_open (xid, oparms, smb2_path, &smb2_oplock, data,NULL ,NULL ,NULL ); oparms->create_options &= ~OPEN_REPARSE_POINT ; }
@@ -238,23 +236,22 @@ int smb2_open_file(const unsigned int xid, struct cifs_open_parms *oparms, rc =0 ; } -if (smb2_data) { +if (data) {/* if open response does not have IndexNumber field - get it */ -if (smb2_data->IndexNumber ==0 ) { +if (data->fi.IndexNumber ==0 ) { rc =SMB2_get_srv_num (xid, oparms->tcon, fid->persistent_fid, fid->volatile_fid, - &smb2_data->IndexNumber); + &data->fi.IndexNumber);if (rc) {/* * let get_inode_info disable server inode * numbers */ - smb2_data->IndexNumber =0 ; + data->fi.IndexNumber =0 ; rc =0 ; } } -memcpy (&data->fi, smb2_data,sizeof (data->fi)); } *oplock = smb2_oplock;
fs/smb/client/smb2pdu.c +13 -12
@@ -3287,7 +3287,7 @@ SMB2_open_free(struct smb_rqst *rqst)int SMB2_open (const unsigned int xid,struct cifs_open_parms *oparms,__le16 *path, -__u8 *oplock,struct smb2_file_all_info *buf, +__u8 *oplock,struct cifs_open_info_data *buf,struct create_posix_rsp *posix,struct kvec *err_iov,int *buftype) {
@@ -3302,6 +3302,7 @@ SMB2_open(const unsigned int xid, struct cifs_open_parms *oparms, __le16 *path,int rc =0 ;int flags =0 ;int retries =0 , cur_sleep =0 ; +struct smb2_file_all_info *file_info = buf ? &buf->fi :NULL ; replay_again:/* reinitialize for possible replay */
@@ -3370,21 +3371,21 @@ SMB2_open(const unsigned int xid, struct cifs_open_parms *oparms, __le16 *path, oparms->fid->mid =le64_to_cpu (rsp->hdr.MessageId);#endif /* CIFS_DEBUG2 */ -if (buf) { - buf->CreationTime = rsp->CreationTime; - buf->LastAccessTime = rsp->LastAccessTime; - buf->LastWriteTime = rsp->LastWriteTime; - buf->ChangeTime = rsp->ChangeTime; - buf->AllocationSize = rsp->AllocationSize; - buf->EndOfFile = rsp->EndofFile; - buf->Attributes = rsp->FileAttributes; - buf->NumberOfLinks =cpu_to_le32 (1 ); - buf->DeletePending =0 ;/* successful open = not delete pending */ +if (file_info) { + file_info->CreationTime = rsp->CreationTime; + file_info->LastAccessTime = rsp->LastAccessTime; + file_info->LastWriteTime = rsp->LastWriteTime; + file_info->ChangeTime = rsp->ChangeTime; + file_info->AllocationSize = rsp->AllocationSize; + file_info->EndOfFile = rsp->EndofFile; + file_info->Attributes = rsp->FileAttributes; + file_info->NumberOfLinks =cpu_to_le32 (1 ); + file_info->DeletePending =0 ;/* successful open = not delete pending */ } rc =smb2_parse_contexts (server, &rsp_iov, &oparms->fid->epoch, - oparms->fid->lease_key, oplock, buf, posix); + oparms->fid->lease_key, oplock, file_info, posix); trace_smb3_open_done(xid, rsp->PersistentFileId, tcon->tid, ses->Suid, oparms->create_options, oparms->desired_access,
fs/smb/client/smb2proto.h +1 -1
@@ -139,7 +139,7 @@ int SMB2_tcon(const unsigned int xid, struct cifs_ses *ses, const char *tree, struct cifs_tcon *tcon, const struct nls_table *cp);int SMB2_tdis (const unsigned int xid,struct cifs_tcon *tcon);int SMB2_open (const unsigned int xid,struct cifs_open_parms *oparms, -__le16 *path,__u8 *oplock,struct smb2_file_all_info *buf, +__le16 *path,__u8 *oplock,struct cifs_open_info_data *buf,struct create_posix_rsp *posix,struct kvec *err_iov,int *buftype); int SMB2_open_init(struct cifs_tcon *tcon, struct TCP_Server_Info *server,
Signature · 1 line
2.54.0
ChenXiaoSong
reviewerPATCH v4 3/3 smb/client: fix incorrect nlink returned by fstat()
In reply to ChenXiaoSongFrom: ChenXiaoSong <[email protected]>
Reproducer:
1. mount -t cifs //${server_ip}/export /mnt
2. touch /mnt/file1; ln /mnt/file1 /mnt/file2; ln /mnt/file1 /mnt/file3
3. C program: int fd = open("/mnt/file1", O_RDONLY);
4. C program: struct stat stbuf; fstat(fd, &stbuf); stbuf.st_nlink is always 1, should be 3
cifs_atomic_open() already obtains the correct nlink. Setting CIFS_FATTR_UNKNOWN_NLINK flag in SMB2_open() will safely preserve the existing i_nlink in cifs_nlink_fattr_to_inode().
Refer to the detailed procedure below:
path_openat
open_last_lookups
lookup_open
atomic_open
cifs_atomic_open // dir->i_op->atomic_open
cifs_lookup
cifs_get_inode_info
cifs_get_fattr
smb2_query_path_info // server->ops->query_path_info
smb2_compound_op
SMB2_open_init
case SMB2_OP_QUERY_INFO
SMB2_query_info_init(FILE_ALL_INFORMATION,)
cifs_open_info_to_fattr
fattr->cf_nlink = le32_to_cpu(info->NumberOfLinks)
update_inode_info
cifs_iget
cifs_fattr_to_inode
cifs_nlink_fattr_to_inode
set_nlink(inode, fattr->cf_nlink)
do_open
vfs_open
do_dentry_open
cifs_open
cifs_nt_open
smb2_open_file // server->ops->open
SMB2_open
buf->cf_flags |= CIFS_FATTR_UNKNOWN_NLINK
cifs_get_inode_info
cifs_get_fattr
cifs_open_info_to_fattr
fattr->cf_flags |= data->cf_flags // set CIFS_FATTR_UNKNOWN_NLINK
update_inode_info
cifs_fattr_to_inode
cifs_nlink_fattr_to_inode
if (fattr->cf_flags & CIFS_FATTR_UNKNOWN_NLINK) // true
return // do not modify nlink--- fs/smb/client/cifsglob.h | 1 + fs/smb/client/inode.c | 1 + fs/smb/client/smb2pdu.c | 1 + 3 files changed, 3 insertions(+)
fs/smb/client/cifsglob.h +1 -0
@@ -250,6 +250,7 @@ struct cifs_open_info_data {bool adjust_tz;bool reparse_point;bool contains_posix_file_info; +u32 cf_flags; struct { /* ioctl response buffer */ struct {
fs/smb/client/inode.c +1 -0
@@ -909,6 +909,7 @@ static void cifs_open_info_to_fattr(struct cifs_fattr *fattr,struct cifs_tcon *tcon =cifs_sb_master_tcon (cifs_sb);memset (fattr,0 ,sizeof (*fattr)); + fattr->cf_flags |= data->cf_flags; fattr->cf_cifsattrs =le32_to_cpu (info->Attributes);if (info->DeletePending) fattr->cf_flags |=CIFS_FATTR_DELETE_PENDING ;
fs/smb/client/smb2pdu.c +1 -0
@@ -3380,6 +3380,7 @@ SMB2_open(const unsigned int xid, struct cifs_open_parms *oparms, __le16 *path, file_info->EndOfFile = rsp->EndofFile; file_info->Attributes = rsp->FileAttributes; file_info->NumberOfLinks =cpu_to_le32 (1 ); + buf->cf_flags |=CIFS_FATTR_UNKNOWN_NLINK ; file_info->DeletePending =0 ;/* successful open = not delete pending */ }
Signature · 1 line
2.54.0