autofs: don't stuck in a loop if vfs_write returns an error

PATCH Applied Ian Kent 1 participant 1 message Jun 16, 2016

Subsystems (2)

VFS Kernel automounter

lore

Share & tools

lore

Ian Kent

author maintainer

2016-06-16 08:31 UTC #0 lore raw

PATCH 1/1 autofs: don't stuck in a loop if vfs_write returns an error

From: Andrey Vagin <[email protected]>

__vfs_write() returns a negative value in a error case.

Signed-off-by Andrey Vagin <[email protected]>

Signed-off-by Ian Kent <[email protected]>

---
 fs/autofs4/waitq.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

fs/autofs4/waitq.c +4 -3

index 0146d91..631f155 100644
@@ -66,11 +66,12 @@ static int autofs4_write(struct autofs_sb_info *sbi,
 	set_fs(KERNEL_DS);
 
 	mutex_lock(&sbi->pipe_mutex);
-	wr = __vfs_write(file, data, bytes, &file->f_pos);
-	while (bytes && wr) {
+	while (bytes) {
+		wr = __vfs_write(file, data, bytes, &file->f_pos);
+		if (wr <= 0)
+			break;
 		data += wr;
 		bytes -= wr;
-		wr = __vfs_write(file, data, bytes, &file->f_pos);
 	}
 	mutex_unlock(&sbi->pipe_mutex);

--
To unsubscribe from this list: send the line "unsubscribe autofs" in