Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3469524imu; Sun, 11 Nov 2018 15:49:51 -0800 (PST) X-Google-Smtp-Source: AJdET5f6JnrvR8c/UKo8m0fM+n94PHufAiMwwNVxu8TBirSLX2lDJBGf4R1D9Ia9DORIEWIm9PL7 X-Received: by 2002:a17:902:a5cc:: with SMTP id t12-v6mr17802228plq.298.1541980191001; Sun, 11 Nov 2018 15:49:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541980190; cv=none; d=google.com; s=arc-20160816; b=OXJVR25jqli3DfI/kMxZchRa4YgFRs4eV9nGXjdB4iOxmQpDrvh3sw7XPh+j14NTck VTvd5MKA9/qUMeNoKJUi8rtRdUEthgqFVG0R1E9FptDsCwqeNtrJ42XE6yIa842WO9d8 W8WgfihKbxEhx85Qm9SHpG6qPPv4/YpBvLdAyp1vFvkLYiQD6zeyzxvBJ51+0Hhe+g8t z6ZuX+D8zHLUIMIaKrrlCuCMhB2+sv2tDM27kkXqqPKRiWfPXnxfT1NzpYskc0VtVehY lKyoy3Km0YVJLQPP9T4ktqmYm4VviGnoQKmHFbcH+Wnno0ebNx320YBmkUW68gqKkQ7U Mphg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=2mD1ASWPzV3TkUWpjjDs6/H2V7izW9bi88NEh1NJwOE=; b=Ch2JgQs1s3JsgR9l8IiAk7uG3MlXeeZAMHsktiFvzP3aCwRySH+q5kqvi68Mex4qoq 0RQGrtWW++5DypH29kQMD7Gtw+nRwxsTkM8e+cKtu7UbfK6OIXyAf6DOQSfVwKzyEH8H s13CUXEbdHc3mfIoAvgcZWTmEiXxVxDmmEIVS9D4NvvamW+RC5MjZplNdk388diS5C8L 8wWw/0bTCiW+vx3eBCg7xUHEp2Eo4LngC3QZz4OUQp/7NSo9rt01lbX2XyrwEcwsr9Kv UGAfzd6hHfVn0vbEXdGAGb+xuZ527HsGwE+BbgxxIxu2vLhRyMefDi+rw2cbfCV6tRI7 o79Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HX8YJX14; 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 v8-v6si16986518pfk.264.2018.11.11.15.49.35; Sun, 11 Nov 2018 15:49:50 -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; dkim=pass header.i=@kernel.org header.s=default header.b=HX8YJX14; 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 S1733182AbeKLJj0 (ORCPT + 99 others); Mon, 12 Nov 2018 04:39:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:38760 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733028AbeKLISl (ORCPT ); Mon, 12 Nov 2018 03:18:41 -0500 Received: from localhost (unknown [206.108.79.134]) (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 6B0A021508; Sun, 11 Nov 2018 22:28:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1541975324; bh=G4DjoRHx6QNaDmeViJCdg4/l4ZWzsNQYg6nLtjfycoM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HX8YJX14G2qG5CbiXynW2Py57ZUG+nsQqbQT0IWJE+DvvddBHR1pJAHM5JW+1GEiW fJ/PWX4Fx9HOO081F3BSMWHQS5/63XLLlg0QltGAq+6XzAC8B2Jd5ecNWaLL9ewmJp U/nbQgpRyRoqnH/sQZNNqEb2310MjJi4qsofnBcc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jeff Mahoney , David Sterba Subject: [PATCH 4.19 329/361] btrfs: fix error handling in free_log_tree Date: Sun, 11 Nov 2018 14:21:16 -0800 Message-Id: <20181111221659.734304563@linuxfoundation.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181111221619.915519183@linuxfoundation.org> References: <20181111221619.915519183@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jeff Mahoney commit 374b0e2d6ba5da7fd1cadb3247731ff27d011f6f upstream. When we hit an I/O error in free_log_tree->walk_log_tree during file system shutdown we can crash due to there not being a valid transaction handle. Use btrfs_handle_fs_error when there's no transaction handle to use. BUG: unable to handle kernel NULL pointer dereference at 0000000000000060 IP: free_log_tree+0xd2/0x140 [btrfs] PGD 0 P4D 0 Oops: 0000 [#1] SMP DEBUG_PAGEALLOC PTI Modules linked in: CPU: 2 PID: 23544 Comm: umount Tainted: G W 4.12.14-kvmsmall #9 SLE15 (unreleased) Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.0.0-prebuilt.qemu-project.org 04/01/2014 task: ffff96bfd3478880 task.stack: ffffa7cf40d78000 RIP: 0010:free_log_tree+0xd2/0x140 [btrfs] RSP: 0018:ffffa7cf40d7bd10 EFLAGS: 00010282 RAX: 00000000fffffffb RBX: 00000000fffffffb RCX: 0000000000000002 RDX: 0000000000000000 RSI: ffff96c02f07d4c8 RDI: 0000000000000282 RBP: ffff96c013cf1000 R08: ffff96c02f07d4c8 R09: ffff96c02f07d4d0 R10: 0000000000000000 R11: 0000000000000002 R12: 0000000000000000 R13: ffff96c005e800c0 R14: ffffa7cf40d7bdb8 R15: 0000000000000000 FS: 00007f17856bcfc0(0000) GS:ffff96c03f600000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000060 CR3: 0000000045ed6002 CR4: 00000000003606e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: ? wait_for_writer+0xb0/0xb0 [btrfs] btrfs_free_log+0x17/0x30 [btrfs] btrfs_drop_and_free_fs_root+0x9a/0xe0 [btrfs] btrfs_free_fs_roots+0xc0/0x130 [btrfs] ? wait_for_completion+0xf2/0x100 close_ctree+0xea/0x2e0 [btrfs] ? kthread_stop+0x161/0x260 generic_shutdown_super+0x6c/0x120 kill_anon_super+0xe/0x20 btrfs_kill_super+0x13/0x100 [btrfs] deactivate_locked_super+0x3f/0x70 cleanup_mnt+0x3b/0x70 task_work_run+0x78/0x90 exit_to_usermode_loop+0x77/0xa6 do_syscall_64+0x1c5/0x1e0 entry_SYSCALL_64_after_hwframe+0x42/0xb7 RIP: 0033:0x7f1784f90827 RSP: 002b:00007ffdeeb03118 EFLAGS: 00000246 ORIG_RAX: 00000000000000a6 RAX: 0000000000000000 RBX: 0000556a60c62970 RCX: 00007f1784f90827 RDX: 0000000000000001 RSI: 0000000000000000 RDI: 0000556a60c62b50 RBP: 0000000000000000 R08: 0000000000000005 R09: 00000000ffffffff R10: 0000556a60c63900 R11: 0000000000000246 R12: 0000556a60c62b50 R13: 00007f17854a81c4 R14: 0000000000000000 R15: 0000000000000000 RIP: free_log_tree+0xd2/0x140 [btrfs] RSP: ffffa7cf40d7bd10 CR2: 0000000000000060 Fixes: 681ae50917df9 ("Btrfs: cleanup reserved space when freeing tree log on error") CC: # v3.13 Signed-off-by: Jeff Mahoney Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/tree-log.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -3196,9 +3196,12 @@ static void free_log_tree(struct btrfs_t }; ret = walk_log_tree(trans, log, &wc); - /* I don't think this can happen but just in case */ - if (ret) - btrfs_abort_transaction(trans, ret); + if (ret) { + if (trans) + btrfs_abort_transaction(trans, ret); + else + btrfs_handle_fs_error(log->fs_info, ret, NULL); + } while (1) { ret = find_first_extent_bit(&log->dirty_log_pages,