6beb01c50d
- update to upstream 3.14.1 - mkfs: - fix TRIM detection - do not zero-out end of device unconditionally - no crash with --features option - fsck: - clear log tree in repair mode - check reloc roots - btrfs - reworked space reporting (bnc#873106) - btrfs fi usage - new command - btrfs dev usage - new command - btrfs fi df - enhanced output with GlobalReserve - Removed patches: * 0001-btrfs-progs-move-arg_strtou64-to-a-separate-file-for.patch - Added patches: * 0001-Btrfs-progs-fix-check-to-test-trim-support.patch * 0002-Btrfs-progs-fsck-fix-double-free-memory-crash.patch * 0003-Btrfs-progs-mkfs-Remove-zero_end-1-since-it-has-been.patch * 0004-btrfs-progs-fix-wrong-max-system-array-size-check-in.patch * 0005-btrfs-progs-move-arg_strtou64-to-a-separate-file-for.patch * 0006-Btrfs-progs-fsck-clear-out-log-tree-in-repair-mode.patch * 0007-Btrfs-progs-fsck-avoid-pinning-same-block-several-ti.patch * 0008-Btrfs-progs-fsck-add-ability-to-check-reloc-roots.patch * 0009-btrfs-progs-prevent-close_root-if-the-root-to-close-.patch * 0010-btrfs-progs-fix-mkfs.btrfs-segfault-with-features-op.patch * 0011-btrfs-progs-Enhance-the-command-btrfs-filesystem-df.patch * 0012-btrfs-progs-Add-helpers-functions-to-handle-the-prin.patch * 0013-btrfs-progs-Add-command-btrfs-filesystem-disk-usage.patch * 0014-btrfs-progs-Add-btrfs-device-disk-usage-command.patch * 0015-btrfs-progs-cleanup-dead-return-after-usage-for-fi-d.patch * 0016-btrfs-progs-Fix-memleak-in-get_raid56_used.patch * 0017-Btrfs-progs-fi-usage-free-memory-if-realloc-fails.patch * 0018-btrfs-progs-read-global-reserve-size-from-space-info.patch * 0019-btrfs-progs-add-original-df-and-rename-disk_usage-to.patch * 0020-btrfs-progs-move-device-usage-to-cmds-device-more-cl.patch * 0021-btrfs-progs-check-if-we-can-t-get-info-from-ioctls-d.patch * 0022-btrfs-progs-zero-out-structures-before-calling-ioctl.patch * 0023-btrfs-progs-print-B-for-bytes.patch * 0024-btrfs-progs-Print-more-info-about-device-sizes.patch * 0025-btrfs-progs-compare-unallocated-space-against-the-co.patch * 0026-btrfs-progs-add-section-of-overall-filesystem-usage.patch * 0027-btrfs-progs-cleanup-filesystem-device-usage-code.patch * 0028-btrfs-progs-extend-pretty-printers-with-unit-mode.patch * 0029-btrfs-progs-replace-df_pretty_sizes-with-pretty_size.patch * 0030-btrfs-progs-clean-up-return-codes-and-paths.patch * 0031-btrfs-progs-move-global-reserve-to-overall-summary.patch OBS-URL: https://build.opensuse.org/request/show/232435 OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=156
44 lines
1.2 KiB
Diff
44 lines
1.2 KiB
Diff
From 07bb42ca797d78333b0fd47189a6504cd25b28d5 Mon Sep 17 00:00:00 2001
|
|
From: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
|
|
Date: Thu, 24 Apr 2014 11:39:28 +0800
|
|
Subject: [PATCH 16/42] btrfs-progs: prevent close_root if the root to close is
|
|
potentially NULL
|
|
|
|
Originally only if 'block_only' is specified, the 'fs_root == NULL'
|
|
will be checked. But if 'block_only' is not specified and close_root
|
|
will be called blindly without checking 'fs_root == NULL', which is
|
|
unsafe.
|
|
|
|
Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
|
|
Signed-off-by: David Sterba <dsterba@suse.cz>
|
|
---
|
|
btrfs-debug-tree.c | 9 +++++----
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/btrfs-debug-tree.c b/btrfs-debug-tree.c
|
|
index 8ae7270dc2fe..cb6c1061b329 100644
|
|
--- a/btrfs-debug-tree.c
|
|
+++ b/btrfs-debug-tree.c
|
|
@@ -177,13 +177,14 @@ int main(int ac, char **av)
|
|
fprintf(stderr, "unable to open %s\n", av[optind]);
|
|
exit(1);
|
|
}
|
|
+
|
|
root = info->fs_root;
|
|
+ if (!root) {
|
|
+ fprintf(stderr, "unable to open %s\n", av[optind]);
|
|
+ exit(1);
|
|
+ }
|
|
|
|
if (block_only) {
|
|
- if (!root) {
|
|
- fprintf(stderr, "unable to open %s\n", av[optind]);
|
|
- exit(1);
|
|
- }
|
|
leaf = read_tree_block(root,
|
|
block_only,
|
|
root->leafsize, 0);
|
|
--
|
|
1.9.0
|
|
|