fs: avoid fdput() after failed fdget() in vfs_dedupe_file_range()
PATCH 1/1 fs: avoid fdput() after failed fdget() in vfs_dedupe_file_range()
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 <[email protected]>
--- fs/read_write.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/read_write.c +3 -3
@@ -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; }
Signature · 1 line
2.16.3
Quoted 3 lines · Zev Weiss
It's a fairly inconsequential bug, since
fdput()won't actually try tofput()the file due to fd.flags (and thusFDPUT_FPUT) being zero in the failure case, but most other vfs code takes steps to avoid this.
Applied.