Received: by 10.223.185.116 with SMTP id b49csp731873wrg; Wed, 21 Feb 2018 06:06:14 -0800 (PST) X-Google-Smtp-Source: AH8x224M/fCFuHRtFo6NzC6LsNNl85PrPVRqs+FrP4unIePddEsCMizm0ZB3XflPbPssGhDqyoop X-Received: by 2002:a17:902:654a:: with SMTP id d10-v6mr2598863pln.117.1519221974344; Wed, 21 Feb 2018 06:06:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519221974; cv=none; d=google.com; s=arc-20160816; b=qbPkrEndy7GpEJ/pj/6I1paF37IQqU7F+SqwF9nicjqZmoDbibsnALo9NTZhUzMO9+ SB9xL94UtvGHR0hBnLVVnzOv3MF64+ySgDNewGS0k4C8nXUmjYwhuM2YdsSsnl6alhfU Cr5BZa7nJnda50p+PbE89IIw8t4IGx+DwlIb7+yvSk9UGrdqxk02pZZsndmYcDjfYnQX nUvGv1jwcWqo4We+01r67c43FXawDW4TiZPYHTYa7orJiMtUPZ9n6kTrS/qHSkL6vlz1 X0bJOlzJDdV9RGQ4GhMp1wtVxsHLml+e1GXlXzGsofC2ExiSoXwuwVyjmDqKw2BszpRu 1UUA== 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 :arc-authentication-results; bh=UQPlcDH8j6xo1QkpeDzgpHqN2e3AOMGKC2GxHsozpTk=; b=eEIW/fgNCKUgGN/XRv1zjAICHP3f6T6odjSvoGvM53DdgjbXJZJx5BBAV1qYq2nhfv ajRge/RFfPzPpRHyw/jOXWgnsQz/xZL0gLMQ00OoHVswsf0QgtJqwnn0nx0bIwkS7uYU VlJiJCMixI5fz+M7uyTPiNE2V/LvRyyAVCgfB0+QYiqvtM/eSIx3W8SXVPSGzOvjkw5G KNoKKh8w8/q1jnImJ3jTt62O8jR9p72ys/LWdDy52Ng+WMMsqcqrvJa/mhD1/aiCN6FI d4SBESHKAK+wUvuMXOMMAJ/ivJYfhiZ0T+3JhZL4NQ2UnSttBEtCIdbIjAZDwk12uefS wXsg== 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 u132si55596pgc.802.2018.02.21.06.05.54; Wed, 21 Feb 2018 06:06:14 -0800 (PST) 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 S935873AbeBUNEL (ORCPT + 99 others); Wed, 21 Feb 2018 08:04:11 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:39798 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935854AbeBUNEH (ORCPT ); Wed, 21 Feb 2018 08:04:07 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 63B681099; Wed, 21 Feb 2018 13:04:06 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Liu Bo , Josef Bacik , David Sterba Subject: [PATCH 4.14 138/167] Btrfs: fix use-after-free on root->orphan_block_rsv Date: Wed, 21 Feb 2018 13:49:09 +0100 Message-Id: <20180221124532.199522834@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180221124524.639039577@linuxfoundation.org> References: <20180221124524.639039577@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review 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: Liu Bo commit 1a932ef4e47984dee227834667b5ff5a334e4805 upstream. I got these from running generic/475, WARNING: CPU: 0 PID: 26384 at fs/btrfs/inode.c:3326 btrfs_orphan_commit_root+0x1ac/0x2b0 [btrfs] BUG: unable to handle kernel NULL pointer dereference at 0000000000000010 IP: btrfs_block_rsv_release+0x1c/0x70 [btrfs] Call Trace: btrfs_orphan_release_metadata+0x9f/0x200 [btrfs] btrfs_orphan_del+0x10d/0x170 [btrfs] btrfs_setattr+0x500/0x640 [btrfs] notify_change+0x7ae/0x870 do_truncate+0xca/0x130 vfs_truncate+0x2ee/0x3d0 do_sys_truncate+0xaf/0xf0 SyS_truncate+0xe/0x10 entry_SYSCALL_64_fastpath+0x1f/0x96 The race is between btrfs_orphan_commit_root and btrfs_orphan_del, t1 t2 btrfs_orphan_commit_root btrfs_orphan_del spin_lock check (&root->orphan_inodes) root->orphan_block_rsv = NULL; spin_unlock atomic_dec(&root->orphan_inodes); access root->orphan_block_rsv Accessing root->orphan_block_rsv must be done before decreasing root->orphan_inodes. cc: v3.12+ Fixes: 703c88e03524 ("Btrfs: fix tracking of orphan inode count") Signed-off-by: Liu Bo Reviewed-by: Josef Bacik Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/inode.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -3371,6 +3371,11 @@ int btrfs_orphan_add(struct btrfs_trans_ ret = btrfs_orphan_reserve_metadata(trans, inode); ASSERT(!ret); if (ret) { + /* + * dec doesn't need spin_lock as ->orphan_block_rsv + * would be released only if ->orphan_inodes is + * zero. + */ atomic_dec(&root->orphan_inodes); clear_bit(BTRFS_INODE_ORPHAN_META_RESERVED, &inode->runtime_flags); @@ -3385,12 +3390,17 @@ int btrfs_orphan_add(struct btrfs_trans_ if (insert >= 1) { ret = btrfs_insert_orphan_item(trans, root, btrfs_ino(inode)); if (ret) { - atomic_dec(&root->orphan_inodes); if (reserve) { clear_bit(BTRFS_INODE_ORPHAN_META_RESERVED, &inode->runtime_flags); btrfs_orphan_release_metadata(inode); } + /* + * btrfs_orphan_commit_root may race with us and set + * ->orphan_block_rsv to zero, in order to avoid that, + * decrease ->orphan_inodes after everything is done. + */ + atomic_dec(&root->orphan_inodes); if (ret != -EEXIST) { clear_bit(BTRFS_INODE_HAS_ORPHAN_ITEM, &inode->runtime_flags); @@ -3422,28 +3432,26 @@ static int btrfs_orphan_del(struct btrfs { struct btrfs_root *root = inode->root; int delete_item = 0; - int release_rsv = 0; int ret = 0; - spin_lock(&root->orphan_lock); if (test_and_clear_bit(BTRFS_INODE_HAS_ORPHAN_ITEM, &inode->runtime_flags)) delete_item = 1; + if (delete_item && trans) + ret = btrfs_del_orphan_item(trans, root, btrfs_ino(inode)); + if (test_and_clear_bit(BTRFS_INODE_ORPHAN_META_RESERVED, &inode->runtime_flags)) - release_rsv = 1; - spin_unlock(&root->orphan_lock); + btrfs_orphan_release_metadata(inode); - if (delete_item) { + /* + * btrfs_orphan_commit_root may race with us and set ->orphan_block_rsv + * to zero, in order to avoid that, decrease ->orphan_inodes after + * everything is done. + */ + if (delete_item) atomic_dec(&root->orphan_inodes); - if (trans) - ret = btrfs_del_orphan_item(trans, root, - btrfs_ino(inode)); - } - - if (release_rsv) - btrfs_orphan_release_metadata(inode); return ret; }