Commit 211baef0 authored by Volker Lendecke's avatar Volker Lendecke Committed by Steve French
Browse files

cifs: Fix smb2_set_path_size() 



If cifs_get_writable_path() finds a writable file, smb2_compound_op()
must use that file's FID and not the COMPOUND_FID.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarVolker Lendecke <vl@samba.org>
Reviewed-by: default avatarPaulo Alcantara (SUSE) <pc@manguebit.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent d0dc4111

fs/cifs/smb2inode.c

+24 −7
Original line number Diff line number Diff line
@@ -234,15 +234,32 @@ static int smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon, 
		size[0] = 8; /* sizeof __le64 */

		data[0] = ptr;



		if (cfile) {

			rc = SMB2_set_info_init(tcon, server,

					&rqst[num_rqst], COMPOUND_FID,

					COMPOUND_FID, current->tgid,

						&rqst[num_rqst],

						cfile->fid.persistent_fid,

						cfile->fid.volatile_fid,

						current->tgid,

						FILE_END_OF_FILE_INFORMATION,

					SMB2_O_INFO_FILE, 0, data, size);

						SMB2_O_INFO_FILE, 0,

						data, size);

		} else {

			rc = SMB2_set_info_init(tcon, server,

						&rqst[num_rqst],

						COMPOUND_FID,

						COMPOUND_FID,

						current->tgid,

						FILE_END_OF_FILE_INFORMATION,

						SMB2_O_INFO_FILE, 0,

						data, size);

			if (!rc) {

				smb2_set_next_command(tcon, &rqst[num_rqst]);

				smb2_set_related(&rqst[num_rqst]);

			}

		}

		if (rc)

			goto finished;

		smb2_set_next_command(tcon, &rqst[num_rqst]);

		smb2_set_related(&rqst[num_rqst++]);

		num_rqst++;

		trace_smb3_set_eof_enter(xid, ses->Suid, tcon->tid, full_path);

		break;

	case SMB2_OP_SET_INFO: