Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp51064pxf; Wed, 24 Mar 2021 20:41:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzHA0ZcvcEA4EaMSkrXAMAz3Oqh2ojUHxV8Kp6DlxqLajvGwIGYm+kfHTgg1iG1ZKU0z9Eu X-Received: by 2002:a17:906:1453:: with SMTP id q19mr7207359ejc.76.1616643697450; Wed, 24 Mar 2021 20:41:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616643697; cv=none; d=google.com; s=arc-20160816; b=naIwpUc6RZGmMoDuzmL29aOkjKMfcTtyEhxIoVXAE9MJGAf+aATJUqvoYrw3pgmvaZ 095es8rpFARCb0VvO/FDDZQRDWrOb6HUtew60JwFr4PAcZqPES4GFGROz9qA/U6tMZl+ 8x9dTkacqa52a3965M2f2JwJ2gEtnYat3jyYJYMRZDABvf9H8UnXekRehbnxAmiOgBy8 MxPj0AJalzv9z7E0HWkZxKaKCWo3V8It6dF6jc7tAv7kcX1OeKR94Zg59spTNJWV7Ubj tGUbZBakg8NcyUFW62CmPN/+Xt8p3m8yCqwlZ95N+mlFNm+qkPKyc98GQQp+WmPlX1+/ sJFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from :dkim-signature; bh=e8tRsrUOq1R3jFmib3Fsd248mqJhpCBsaBrEMwLZ8jQ=; b=CJwFiWInL3Mbaa4oSPard4f4Cn0PqktDcbYGOcH/j3tM8KroyoRcN1bffLc1aHz26f vykA/ZOGnIDSiPBHRLOhivz/sr3nHc4nuCesnVYIN5RyKJjLqlg7FRjZHgfrATfiHb2J 1oDxgiYJohBRYJESNebo3BGaxTN1WItIiKEG5BETD28BeckxA0rcSVE46ue5fF0qz1XN /mP0cWM/LqMNDxWj4TgCBX9MMu87hi1CidU6fcoD1NKYXf6qIqniDODo+7NHzVLGlcOl ATo7BWXK8DMW1/vA9gt3Algo7WojGl1DqoydOpBi3OVAi/75pCYOAxJfZwZX60HthP3i v8/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@synology.com header.s=123 header.b=SLPcDuXI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=synology.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id kk22si3252907ejc.98.2021.03.24.20.41.15; Wed, 24 Mar 2021 20:41:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@synology.com header.s=123 header.b=SLPcDuXI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=synology.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229900AbhCYB5O (ORCPT + 99 others); Wed, 24 Mar 2021 21:57:14 -0400 Received: from mail.synology.com ([211.23.38.101]:57326 "EHLO synology.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S233661AbhCYB4q (ORCPT ); Wed, 24 Mar 2021 21:56:46 -0400 Received: from localhost.localdomain (unknown [10.17.32.161]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by synology.com (Postfix) with ESMTPSA id 0E547CE7820E; Thu, 25 Mar 2021 09:56:45 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synology.com; s=123; t=1616637405; bh=krI28xV4SCJ+OHpQAF/KvRf/HkegVa0mjl+q4jhFiM4=; h=From:To:Cc:Subject:Date; b=SLPcDuXIeKsmQrrlT50zyPHmrpSXBXQeoxG/8XUaTe/JSGyOwyjf9l3P6HxjfWatH QB6oz1ZvVqK8i4IJq4N+Pr9ehlOpuh26ISrvbjmC+zvQTiqYg7EmUW9cT0m+tSDmIb 1G0Js19iXXZ3Nn+JcL5eA1WTEIqJ/H3XIOkv5Wa4= From: bingjingc To: josef@toxicpanda.com, dsterba@suse.com, quwenruo@cn.fujitsu.com, clm@fb.com, linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org Cc: bingjingc@synology.com, cccheng@synology.com, robbieko@synology.com Subject: [PATCH v2] btrfs: fix a potential hole-punching failure Date: Thu, 25 Mar 2021 09:56:22 +0800 Message-Id: <1616637382-27311-1-git-send-email-bingjingc@synology.com> X-Mailer: git-send-email 2.7.4 X-Synology-MCP-Status: no X-Synology-Spam-Flag: no X-Synology-Spam-Status: score=0, required 6, WHITELIST_FROM_ADDRESS 0 X-Synology-Virus-Status: no Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: BingJing Chang In commit d77815461f04 ("btrfs: Avoid trucating page or punching hole in a already existed hole."), existed holes can be skipped by calling find_first_non_hole() to adjust *start and *len. However, if the given len is invalid and large, when an EXTENT_MAP_HOLE extent is found, the *len will not be set to zero because (em->start + em->len) is less than (*start + *len). Then the ret will be 1 but the *len will not be set to 0. The propagated non-zero ret will result in fallocate failure. In the while-loop of btrfs_replace_file_extents(), len is not updated every time before it calls find_first_non_hole(). That is, after btrfs_drop_extents() successfully drops the last non-hole file extent, it may fail with -ENOSPC when attempting to drop a file extent item representing a hole. The problem can happen. After it calls find_first_non_hole(), the cur_offset will be adjusted to be larger than or equal to end. However, since the len is not set to zero. The break-loop condition (ret && !len) will not meet. After it leaves the while-loop, fallocate will return 1, which is an unexpected return value. We're not able to construct a reproducible way to let btrfs_drop_extents() fail with -ENOSPC after it drops the last non-hole file extent but with remaining holes left. However, it's quite easy to fix. We just need to update and check the len every time before we call find_first_non_hole(). To make the while loop more readable, we also pull the variable updates to the bottom of loop like this: while (cur_offset < end) { ... // update cur_offset & len // advance cur_offset & len in hole-punching case if needed } Reported-by: Robbie Ko Fixes: d77815461f04 ("btrfs: Avoid trucating page or punching hole in a already existed hole.") Reviewed-by: Robbie Ko Reviewed-by: Chung-Chiang Cheng Signed-off-by: BingJing Chang --- fs/btrfs/file.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 0e155f0..dccb017 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -2735,8 +2735,6 @@ int btrfs_replace_file_extents(struct inode *inode, struct btrfs_path *path, extent_info->file_offset += replace_len; } - cur_offset = drop_args.drop_end; - ret = btrfs_update_inode(trans, root, BTRFS_I(inode)); if (ret) break; @@ -2756,7 +2754,9 @@ int btrfs_replace_file_extents(struct inode *inode, struct btrfs_path *path, BUG_ON(ret); /* shouldn't happen */ trans->block_rsv = rsv; - if (!extent_info) { + cur_offset = drop_args.drop_end; + len = end - cur_offset; + if (!extent_info && len) { ret = find_first_non_hole(BTRFS_I(inode), &cur_offset, &len); if (unlikely(ret < 0)) -- 2.7.4