Received: by 10.192.165.148 with SMTP id m20csp4180622imm; Mon, 30 Apr 2018 13:19:23 -0700 (PDT) X-Google-Smtp-Source: AB8JxZr0Y14tUchV0Th2eXjukIn5zF4vaiYehLdu4VgnZzo1heZByR7weed0DUutXuPO626Ad9cH X-Received: by 2002:a17:902:8d8b:: with SMTP id v11-v6mr14081756plo.9.1525119563516; Mon, 30 Apr 2018 13:19:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525119563; cv=none; d=google.com; s=arc-20160816; b=pQajtZqqzGYCV86wOhVNFNvgT5hRSB67tsITfWTrozt3Uzv1IJC3R/gtSozN+jvFAV ySIYeaskJh160HGkeaPS5NEe+HsyfdyrW6zO3fRnzFUzvssBbwMOnMEqOhwyoeUfE+WA qAi96I54pzUHx3oMzRn8vdTinuk7JcJ+vKWPGzGmtZqHsTQA3hLmxG3HbDVwpBxR5Zjr h8o20OF1tkPgxhwkFEUKAnb4oxcX8WqavwZ1WAUj6gjXq3bB+d0x1QnM+vtcRBwPEhBg kzK97jqBndEgEWWswLj+Ssz812jwD5L5GecZ4Nx0V1f026j3lbnBLEAzYLwoYC/hiJua aMuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from:dmarc-filter :arc-authentication-results; bh=kptHCitcJTE0eJc4cdeM+6lBMTG2Ek4B/BUn8Pfd5Dc=; b=aWQDGuq0LQIowzifEKmd32J8v1tn7vnwhiom1gj+m4b4dc9dnN41t8xuo6QkFXz/Rn iYQlrlfF0anK9XvLS6/J+MR+B6r8FR3BgKivpH6M5XkNf3gpmr82uSOtWPY23ZxG7nrf FRi4ByhQTZQ1uXiYpE5th87W7dwQWqOdz45TRJryqE2JnBmptuhayB1miZg8PA6g43ue nv4nhllG35JjP1xqRkxT7LZceCii+116SWnlYyHfTK7tMhUGonxUwz7H9EaaNaVEICQb 1ln9dyav4pZ73dOJyTaU7/+4w5nrkT0iNF6bpV3EEMZluQwSM2vwF/U86OoeFrZbSV4U C6Bg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b3-v6si2079582plc.14.2018.04.30.13.18.39; Mon, 30 Apr 2018 13:19:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755916AbeD3USb (ORCPT + 99 others); Mon, 30 Apr 2018 16:18:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:32866 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755822AbeD3T0z (ORCPT ); Mon, 30 Apr 2018 15:26:55 -0400 Received: from localhost (unknown [104.132.1.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6645122DAC; Mon, 30 Apr 2018 19:26:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6645122DAC Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=fail smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+06c885be0edcdaeab40c@syzkaller.appspotmail.com, Eric Biggers , Theodore Tso Subject: [PATCH 4.14 01/91] ext4: prevent right-shifting extents beyond EXT_MAX_BLOCKS Date: Mon, 30 Apr 2018 12:23:43 -0700 Message-Id: <20180430184004.287281402@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180430184004.216234025@linuxfoundation.org> References: <20180430184004.216234025@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Biggers commit 349fa7d6e1935f49bf4161c4900711b2989180a9 upstream. During the "insert range" fallocate operation, extents starting at the range offset are shifted "right" (to a higher file offset) by the range length. But, as shown by syzbot, it's not validated that this doesn't cause extents to be shifted beyond EXT_MAX_BLOCKS. In that case ->ee_block can wrap around, corrupting the extent tree. Fix it by returning an error if the space between the end of the last extent and EXT4_MAX_BLOCKS is smaller than the range being inserted. This bug can be reproduced by running the following commands when the current directory is on an ext4 filesystem with a 4k block size: fallocate -l 8192 file fallocate --keep-size -o 0xfffffffe000 -l 4096 -n file fallocate --insert-range -l 8192 file Then after unmounting the filesystem, e2fsck reports corruption. Reported-by: syzbot+06c885be0edcdaeab40c@syzkaller.appspotmail.com Fixes: 331573febb6a ("ext4: Add support FALLOC_FL_INSERT_RANGE for fallocate") Cc: stable@vger.kernel.org # v4.2+ Signed-off-by: Eric Biggers Signed-off-by: Theodore Ts'o Signed-off-by: Greg Kroah-Hartman --- fs/ext4/extents.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -5346,8 +5346,9 @@ ext4_ext_shift_extents(struct inode *ino stop = le32_to_cpu(extent->ee_block); /* - * In case of left shift, Don't start shifting extents until we make - * sure the hole is big enough to accommodate the shift. + * For left shifts, make sure the hole on the left is big enough to + * accommodate the shift. For right shifts, make sure the last extent + * won't be shifted beyond EXT_MAX_BLOCKS. */ if (SHIFT == SHIFT_LEFT) { path = ext4_find_extent(inode, start - 1, &path, @@ -5367,9 +5368,14 @@ ext4_ext_shift_extents(struct inode *ino if ((start == ex_start && shift > ex_start) || (shift > start - ex_end)) { - ext4_ext_drop_refs(path); - kfree(path); - return -EINVAL; + ret = -EINVAL; + goto out; + } + } else { + if (shift > EXT_MAX_BLOCKS - + (stop + ext4_ext_get_actual_len(extent))) { + ret = -EINVAL; + goto out; } }