From patchwork Tue May 22 22:02:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 10419669 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 BB071600CC for ; Tue, 22 May 2018 22:02:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A834B28F64 for ; Tue, 22 May 2018 22:02:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9D40A29043; Tue, 22 May 2018 22:02: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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 43CA328F64 for ; Tue, 22 May 2018 22:02:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753349AbeEVWC3 (ORCPT ); Tue, 22 May 2018 18:02:29 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:46724 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753113AbeEVWCW (ORCPT ); Tue, 22 May 2018 18:02:22 -0400 Received: by mail-pf0-f194.google.com with SMTP id p12-v6so9404205pff.13 for ; Tue, 22 May 2018 15:02:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=LdaJ0ZeUcE9Cnb+/T3slj1uXaCQxe5xmzOynoHRVy9U=; b=fv73IJRzuvkGgT7Cx+RzqrudkC5oMsO+0YrRPGzQImt1gHbqvx7FjgJ2V0mnKEofWm ZAxV1bBZ2XlUxJr2sCZ6v5weKmSceEh3c3wqGtsGHkzPucFSxkV6Cdq8Lj3B+69Cl+kE nldGsvgbaWTLkVdXwYvZ4aMavdu1PaaSu1AUdjTGTzLh/qfdGamxY6Fa1SokMzhn0fnQ ImWLvh5Yp5ArqUleObLUc31topR2JKtIY3XL1eO4n34S1/AZK7mv273fzqbHUkEp6aQM ZJf9HcUlsP6wBTv/+pKExP+UjSGph8WdtvdwOZn03JS4fnx16MIE0V8nq392GArGTRCE bLIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=LdaJ0ZeUcE9Cnb+/T3slj1uXaCQxe5xmzOynoHRVy9U=; b=kQUKwyByNuI5iqSbsO5j6x0miTyKGhYhkPBEM05hLUkrq92ZBnxdlqNRh141LnH3Y8 kTw/D/YytQRdkxtCRM5ykNMseuARqEq8Q3frLLIzqZ+rEuVqXA+OYR3CDopoD1ROXusV YVQaBEHdDKDdpWhgXV/Z8+GqfiJTj8+gcAcH7BHZgpi00JF9iTdfLIogE1y1eB0drYDw x1PDmCRVVum6KZRN/a+/y1FrO0izCKWilxmlkNOo5/GqFghk3A9qr3dHxOZOGEVKbxlE LHurs4zT7rtRY6Pw8NmW3fo370r2T4e9sl5Hn/IpTMO/7FSU3rCSTkJHQRIFbNGsL3PR cIFQ== X-Gm-Message-State: ALKqPwcN8V5kCNqwT2fvWXMspToMXWfRXBCRGJ1q0HWaSAw7Ak8pxuJU id560xO+8g3hOit3NfsAfxeIX3pfgBM= X-Google-Smtp-Source: AB8JxZp4zjRMNUnI51NDU/k6oOG43ge/B9qirIvQZBBcDxGpfyIwAw+keD1YUXPMPe2Zp+Dx4Ni5cw== X-Received: by 2002:a63:4383:: with SMTP id q125-v6mr188852pga.412.1527026541022; Tue, 22 May 2018 15:02:21 -0700 (PDT) Received: from vader.thefacebook.com ([2620:10d:c090:200::7:5b87]) by smtp.gmail.com with ESMTPSA id t9-v6sm26226308pgr.37.2018.05.22.15.02.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 May 2018 15:02:20 -0700 (PDT) From: Omar Sandoval To: linux-btrfs@vger.kernel.org Cc: kernel-team@fb.com, David Sterba , Timofey Titovets Subject: [PATCH 1/2] Btrfs: fix clone vs chattr NODATASUM race Date: Tue, 22 May 2018 15:02:12 -0700 Message-Id: X-Mailer: git-send-email 2.17.0 In-Reply-To: References: In-Reply-To: References: 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 From: Omar Sandoval In btrfs_clone_files(), we must check the NODATASUM flag while the inodes are locked. Otherwise, it's possible that btrfs_ioctl_setflags() will change the flags after we check and we can end up with a party checksummed file. Fixes: 0e7b824c4ef9 ("Btrfs: don't make a file partly checksummed through file clone") Signed-off-by: Omar Sandoval Reviewed-by: Nikolay Borisov Reviewed-by: David Sterba --- fs/btrfs/ioctl.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index cf0d3bc6f625..784e267aad32 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -4280,11 +4280,6 @@ static noinline int btrfs_clone_files(struct file *file, struct file *file_src, src->i_sb != inode->i_sb) return -EXDEV; - /* don't make the dst file partly checksummed */ - if ((BTRFS_I(src)->flags & BTRFS_INODE_NODATASUM) != - (BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM)) - return -EINVAL; - if (S_ISDIR(src->i_mode) || S_ISDIR(inode->i_mode)) return -EISDIR; @@ -4294,6 +4289,13 @@ static noinline int btrfs_clone_files(struct file *file, struct file *file_src, inode_lock(src); } + /* don't make the dst file partly checksummed */ + if ((BTRFS_I(src)->flags & BTRFS_INODE_NODATASUM) != + (BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM)) { + ret = -EINVAL; + goto out_unlock; + } + /* determine range to clone */ ret = -EINVAL; if (off + len > src->i_size || off + len < off)