fs: avoid fdput() after failed fdget() in vfs_dedupe_file_range()
authorZev Weiss <zev@bewilderbeest.net>
Sat, 14 Apr 2018 06:16:58 +0000 (01:16 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Mon, 16 Apr 2018 03:36:26 +0000 (23:36 -0400)
It's a fairly inconsequential bug, since fdput() won't actually try to
fput() the file due to fd.flags (and thus FDPUT_FPUT) being zero in
the failure case, but most other vfs code takes steps to avoid this.

Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/read_write.c

index c4eabbf..e83bd97 100644 (file)
@@ -2023,7 +2023,7 @@ int vfs_dedupe_file_range(struct file *file, struct file_dedupe_range *same)
                ret = mnt_want_write_file(dst_file);
                if (ret) {
                        info->status = ret;
-                       goto next_loop;
+                       goto next_fdput;
                }
 
                dst_off = info->dest_offset;
@@ -2058,9 +2058,9 @@ int vfs_dedupe_file_range(struct file *file, struct file_dedupe_range *same)
 
 next_file:
                mnt_drop_write_file(dst_file);
-next_loop:
+next_fdput:
                fdput(dst_fd);
-
+next_loop:
                if (fatal_signal_pending(current))
                        goto out;
        }