Skip to contentSkip to conversation

Patch "Do not return number of bytes written for ioctl CIFS_IOC_COPYCHUNK_FILE" has been added to the 4.11-stable tree

PATCH [email protected] 1 participant 1 message May 17, 2017 Stable branch

lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

Do not return number of bytes written for ioctl CIFS_IOC_COPYCHUNK_FILE

to the 4.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
do-not-return-number-of-bytes-written-for-ioctl-cifs_ioc_copychunk_file.patch
and it can be found in the queue-4.11 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 7d0c234fd2e1c9ca3fa032696c0c58b1b74a9e0b Mon Sep 17 00:00:00 2001

From: Sachin Prabhu <[email protected]>
Date: Wed, 26 Apr 2017 17:10:17 +0100
Subject: Do not return number of bytes written for ioctl CIFS_IOC_COPYCHUNK_FILE

From: Sachin Prabhu <[email protected]>

commit 7d0c234fd2e1c9ca3fa032696c0c58b1b74a9e0b upstream.

commit 620d8745b35d ("Introduce cifs_copy_file_range()") changes the behaviour of the cifs ioctl call CIFS_IOC_COPYCHUNK_FILE. In case of successful writes, it now returns the number of bytes written. This return value is treated as an error by the xfstest cifs/001. Depending on the errno set at that time, this may or may not result in the test failing.

The patch fixes this by setting the return value to 0 in case of successful writes.

Fixes commit 620d8745b35d ("Introduce cifs_copy_file_range()")
---
 fs/cifs/ioctl.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
fs/cifs/ioctl.c +2 -1
@@ -74,7 +74,8 @@ static long cifs_ioctl_copychunk(unsigne
 
 	rc = cifs_file_copychunk_range(xid, src_file.file, 0, dst_file, 0,
 					src_inode->i_size, 0);
-
+	if (rc > 0)
+		rc = 0;
 out_fput:
 	fdput(src_file);
 out_drop_write:

Patches currently in stable-queue which might be from [email protected] are

queue-4.11/do-not-return-number-of-bytes-written-for-ioctl-cifs_ioc_copychunk_file.patch queue-4.11/fix-match_prepath.patch