From patchwork Sat Apr 14 06:16:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zev Weiss X-Patchwork-Id: 10340925 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 296F860329 for ; Sat, 14 Apr 2018 06:29:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1A78928A6C for ; Sat, 14 Apr 2018 06:29:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0EEF628A73; Sat, 14 Apr 2018 06:29:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B602928A6C for ; Sat, 14 Apr 2018 06:29:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750948AbeDNG3Q (ORCPT ); Sat, 14 Apr 2018 02:29:16 -0400 Received: from thorn.bewilderbeest.net ([71.19.156.171]:49820 "EHLO thorn.bewilderbeest.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750878AbeDNG3P (ORCPT ); Sat, 14 Apr 2018 02:29:15 -0400 X-Greylist: delayed 630 seconds by postgrey-1.27 at vger.kernel.org; Sat, 14 Apr 2018 02:29:15 EDT Received: from hatter.bewilderbeest.net (hatter.bewilderbeest.net [IPv6:2001:470:c3f4:1::1:1]) (using TLSv1.2 with cipher DHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: zev) by thorn.bewilderbeest.net (Postfix) with ESMTPSA id 3F775804E8; Fri, 13 Apr 2018 23:18:44 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 thorn.bewilderbeest.net 3F775804E8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bewilderbeest.net; s=thorn; t=1523686724; bh=N1xJYFIQoNxze+bkXXBoUb1spq0E2zhj1XRARNNPk8Q=; h=From:To:Cc:Subject:Date:From; b=YjGRdLsvr3fvxhW7Nw9r4aJOSyEGcWgt+lfNo0MDpLfZ+c3Smp9SOcwhvL+nYBKaZ FJzvavTqi/OawV3QItT5PsJgaETwhDHO6s5w3zHUQOpO4qA7seSwBm+IB4q1aKT18y YfhQno9V3lQU/Axd/YbcTTbaOKjlUmWpHkgYXAgw= From: Zev Weiss To: Alexander Viro Cc: "Darrick J . Wong" , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Zev Weiss Subject: [PATCH] fs: avoid fdput() after failed fdget() in vfs_dedupe_file_range() Date: Sat, 14 Apr 2018 01:16:58 -0500 Message-Id: <20180414061658.3774-1-zev@bewilderbeest.net> X-Mailer: git-send-email 2.16.3 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- fs/read_write.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/read_write.c b/fs/read_write.c index c4eabbfc90df..e83bd9744b5d 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -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; }