From patchwork Mon Sep 10 23:21:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Fasheh X-Patchwork-Id: 10594873 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3861813B8 for ; Mon, 10 Sep 2018 23:21:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 28CD429123 for ; Mon, 10 Sep 2018 23:21:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1BA7329182; Mon, 10 Sep 2018 23:21:36 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham 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 B09E029123 for ; Mon, 10 Sep 2018 23:21:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726519AbeIKERz (ORCPT ); Tue, 11 Sep 2018 00:17:55 -0400 Received: from mx2.suse.de ([195.135.220.15]:43090 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726251AbeIKERz (ORCPT ); Tue, 11 Sep 2018 00:17:55 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 08177AE5B; Mon, 10 Sep 2018 23:21:32 +0000 (UTC) From: Mark Fasheh To: Andrew Morton Cc: Al Viro , linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org, Michael Kerrisk , linux-btrfs@vger.kernel.org, linux-xfs@vger.kernel.org, "Darrick J . Wong" , Adam Borowski , David Sterba , Mark Fasheh Subject: [PATCH 1/2] vfs: allow dedupe of user owned read-only files Date: Mon, 10 Sep 2018 16:21:17 -0700 Message-Id: <20180910232118.14424-2-mfasheh@suse.de> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180910232118.14424-1-mfasheh@suse.de> References: <20180910232118.14424-1-mfasheh@suse.de> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The permission check in vfs_dedupe_file_range_one() is too coarse - We only allow dedupe of the destination file if the user is root, or they have the file open for write. This effectively limits a non-root user from deduping their own read-only files. In addition, the write file descriptor that the user is forced to hold open can prevent execution of files. As file data during a dedupe does not change, the behavior is unexpected and this has caused a number of issue reports. For an example, see: https://github.com/markfasheh/duperemove/issues/129 So change the check so we allow dedupe on the target if: - the root or admin is asking for it - the process has write access - the owner of the file is asking for the dedupe - the process could get write access That way users can open read-only and still get dedupe. Signed-off-by: Mark Fasheh --- fs/read_write.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/fs/read_write.c b/fs/read_write.c index 39b4a21dd933..be0e8723a049 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -1964,6 +1964,20 @@ int vfs_dedupe_file_range_compare(struct inode *src, loff_t srcoff, } EXPORT_SYMBOL(vfs_dedupe_file_range_compare); +/* Check whether we are allowed to dedupe the destination file */ +static bool allow_file_dedupe(struct file *file) +{ + if (capable(CAP_SYS_ADMIN)) + return true; + if (file->f_mode & FMODE_WRITE) + return true; + if (uid_eq(current_fsuid(), file_inode(file)->i_uid)) + return true; + if (!inode_permission(file_inode(file), MAY_WRITE)) + return true; + return false; +} + int vfs_dedupe_file_range_one(struct file *src_file, loff_t src_pos, struct file *dst_file, loff_t dst_pos, u64 len) { @@ -1978,7 +1992,7 @@ int vfs_dedupe_file_range_one(struct file *src_file, loff_t src_pos, goto out_drop_write; ret = -EINVAL; - if (!(capable(CAP_SYS_ADMIN) || (dst_file->f_mode & FMODE_WRITE))) + if (!allow_file_dedupe(dst_file)) goto out_drop_write; ret = -EXDEV; From patchwork Mon Sep 10 23:21:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Fasheh X-Patchwork-Id: 10594879 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 034BB6CB for ; Mon, 10 Sep 2018 23:21:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E7B5629123 for ; Mon, 10 Sep 2018 23:21:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DBFC429182; Mon, 10 Sep 2018 23:21:37 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham 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 9068829123 for ; Mon, 10 Sep 2018 23:21:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726556AbeIKER5 (ORCPT ); Tue, 11 Sep 2018 00:17:57 -0400 Received: from mx2.suse.de ([195.135.220.15]:43114 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726251AbeIKER5 (ORCPT ); Tue, 11 Sep 2018 00:17:57 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 9E55CAE88; Mon, 10 Sep 2018 23:21:34 +0000 (UTC) From: Mark Fasheh To: Andrew Morton Cc: Al Viro , linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org, Michael Kerrisk , linux-btrfs@vger.kernel.org, linux-xfs@vger.kernel.org, "Darrick J . Wong" , Adam Borowski , David Sterba , Mark Fasheh Subject: [PATCH 2/2] vfs: dedupe should return EPERM if permission is not granted Date: Mon, 10 Sep 2018 16:21:18 -0700 Message-Id: <20180910232118.14424-3-mfasheh@suse.de> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180910232118.14424-1-mfasheh@suse.de> References: <20180910232118.14424-1-mfasheh@suse.de> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Right now we return EINVAL if a process does not have permission to dedupe a file. This was an oversight on my part. EPERM gives a true description of the nature of our error, and EINVAL is already used for the case that the filesystem does not support dedupe. Signed-off-by: Mark Fasheh Reviewed-by: Darrick J. Wong Acked-by: David Sterba --- fs/read_write.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/read_write.c b/fs/read_write.c index be0e8723a049..c734bc2880a5 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -1991,7 +1991,7 @@ int vfs_dedupe_file_range_one(struct file *src_file, loff_t src_pos, if (ret < 0) goto out_drop_write; - ret = -EINVAL; + ret = -EPERM; if (!allow_file_dedupe(dst_file)) goto out_drop_write;