]> git.itanic.dy.fi Git - linux-stable/commitdiff
cifs: fix pcchunk length type in smb2_copychunk_range
authorPawel Witek <pawel.ireneusz.witek@gmail.com>
Fri, 5 May 2023 15:14:59 +0000 (17:14 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 May 2023 09:50:22 +0000 (11:50 +0200)
commit d66cde50c3c868af7abddafce701bb86e4a93039 upstream.

Change type of pcchunk->Length from u32 to u64 to match
smb2_copychunk_range arguments type. Fixes the problem where performing
server-side copy with CIFS_IOC_COPYCHUNK_FILE ioctl resulted in incomplete
copy of large files while returning -EINVAL.

Fixes: 9bf0c9cd4314 ("CIFS: Fix SMB2/SMB3 Copy offload support (refcopy) for large files")
Cc: <stable@vger.kernel.org>
Signed-off-by: Pawel Witek <pawel.ireneusz.witek@gmail.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/cifs/smb2ops.c

index fab58293390925f558f11ab41f504fec59228b3f..54058a9ada7406f0c2d802fc81da976659a05efe 100644 (file)
@@ -1893,7 +1893,7 @@ smb2_copychunk_range(const unsigned int xid,
                pcchunk->SourceOffset = cpu_to_le64(src_off);
                pcchunk->TargetOffset = cpu_to_le64(dest_off);
                pcchunk->Length =
-                       cpu_to_le32(min_t(u32, len, tcon->max_bytes_chunk));
+                       cpu_to_le32(min_t(u64, len, tcon->max_bytes_chunk));
 
                /* Request server copy to target from src identified by key */
                kfree(retbuf);