Commit 968f35f4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'v6.7-rc3-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6 

Pull smb client fixes from Steve French:

 - Two fallocate fixes

 - Fix warnings from new gcc

 - Two symlink fixes

* tag 'v6.7-rc3-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  smb: client, common: fix fortify warnings
  cifs: Fix FALLOC_FL_INSERT_RANGE by setting i_size after EOF moved
  cifs: Fix FALLOC_FL_ZERO_RANGE by setting i_size if EOF moved
  smb: client: report correct st_size for SMB and NFS symlinks
  smb: client: fix missing mode bits for SMB symlinks
parents 55abae43 0015eb6e

fs/smb/client/cifspdu.h

+14 −10
Original line number Diff line number Diff line
@@ -882,11 +882,13 @@ typedef struct smb_com_open_rsp { 
	__u8 OplockLevel;

	__u16 Fid;

	__le32 CreateAction;

	struct_group(common_attributes,

		__le64 CreationTime;

		__le64 LastAccessTime;

		__le64 LastWriteTime;

		__le64 ChangeTime;

		__le32 FileAttributes;

	);

	__le64 AllocationSize;

	__le64 EndOfFile;

	__le16 FileType;
@@ -2264,11 +2266,13 @@ typedef struct { 
/* QueryFileInfo/QueryPathinfo (also for SetPath/SetFile) data buffer formats */

/******************************************************************************/

typedef struct { /* data block encoding of response to level 263 QPathInfo */

	struct_group(common_attributes,

		__le64 CreationTime;

		__le64 LastAccessTime;

		__le64 LastWriteTime;

		__le64 ChangeTime;

		__le32 Attributes;

	);

	__u32 Pad1;

	__le64 AllocationSize;

	__le64 EndOfFile;	/* size ie offset to first free byte in file */

fs/smb/client/cifssmb.c

+4 −2
Original line number Diff line number Diff line
@@ -1244,8 +1244,10 @@ CIFS_open(const unsigned int xid, struct cifs_open_parms *oparms, int *oplock, 
		*oplock |= CIFS_CREATE_ACTION;



	if (buf) {

		/* copy from CreationTime to Attributes */

		memcpy((char *)buf, (char *)&rsp->CreationTime, 36);

		/* copy commonly used attributes */

		memcpy(&buf->common_attributes,

		       &rsp->common_attributes,

		       sizeof(buf->common_attributes));

		/* the file_info buf is endian converted by caller */

		buf->AllocationSize = rsp->AllocationSize;

		buf->EndOfFile = rsp->EndOfFile;

fs/smb/client/inode.c

+3 −1
Original line number Diff line number Diff line
@@ -790,7 +790,7 @@ bool cifs_reparse_point_to_fattr(struct cifs_sb_info *cifs_sb, 
	case 0: /* SMB1 symlink */

	case IO_REPARSE_TAG_SYMLINK:

	case IO_REPARSE_TAG_NFS:

		fattr->cf_mode = S_IFLNK;

		fattr->cf_mode = S_IFLNK | cifs_sb->ctx->file_mode;

		fattr->cf_dtype = DT_LNK;

		break;

	default:
@@ -865,6 +865,8 @@ static void cifs_open_info_to_fattr(struct cifs_fattr *fattr, 


out_reparse:

	if (S_ISLNK(fattr->cf_mode)) {

		if (likely(data->symlink_target))

			fattr->cf_eof = strnlen(data->symlink_target, PATH_MAX);

		fattr->cf_symlink_target = data->symlink_target;

		data->symlink_target = NULL;

	}

fs/smb/client/smb2ops.c

+11 −2
Original line number Diff line number Diff line
@@ -3311,6 +3311,7 @@ static long smb3_zero_range(struct file *file, struct cifs_tcon *tcon, 
	struct inode *inode = file_inode(file);

	struct cifsInodeInfo *cifsi = CIFS_I(inode);

	struct cifsFileInfo *cfile = file->private_data;

	unsigned long long new_size;

	long rc;

	unsigned int xid;

	__le64 eof;
@@ -3341,10 +3342,15 @@ static long smb3_zero_range(struct file *file, struct cifs_tcon *tcon, 
	/*

	 * do we also need to change the size of the file?

	 */

	if (keep_size == false && i_size_read(inode) < offset + len) {

		eof = cpu_to_le64(offset + len);

	new_size = offset + len;

	if (keep_size == false && (unsigned long long)i_size_read(inode) < new_size) {

		eof = cpu_to_le64(new_size);

		rc = SMB2_set_eof(xid, tcon, cfile->fid.persistent_fid,

				  cfile->fid.volatile_fid, cfile->pid, &eof);

		if (rc >= 0) {

			truncate_setsize(inode, new_size);

			fscache_resize_cookie(cifs_inode_cookie(inode), new_size);

		}

	}



 zero_range_exit:
@@ -3739,6 +3745,9 @@ static long smb3_insert_range(struct file *file, struct cifs_tcon *tcon, 
	if (rc < 0)

		goto out_2;



	truncate_setsize(inode, old_eof + len);

	fscache_resize_cookie(cifs_inode_cookie(inode), i_size_read(inode));



	rc = smb2_copychunk_range(xid, cfile, cfile, off, count, off + len);

	if (rc < 0)

		goto out_2;

fs/smb/client/smb2pdu.c

+3 −5
Original line number Diff line number Diff line
@@ -3472,12 +3472,10 @@ __SMB2_close(const unsigned int xid, struct cifs_tcon *tcon, 
	} else {

		trace_smb3_close_done(xid, persistent_fid, tcon->tid,

				      ses->Suid);

		/*

		 * Note that have to subtract 4 since struct network_open_info

		 * has a final 4 byte pad that close response does not have

		 */

		if (pbuf)

			memcpy(pbuf, (char *)&rsp->CreationTime, sizeof(*pbuf) - 4);

			memcpy(&pbuf->network_open_info,

			       &rsp->network_open_info,

			       sizeof(pbuf->network_open_info));

	}



	atomic_dec(&tcon->num_remote_opens);