* [PATCH v2 1/2] btrfs-progs: dump-super: check array_size in print_sys_chunk_array
@ 2017-04-20 8:07 Lu Fengqi
2017-04-20 8:07 ` [PATCH v2 2/2] btrfs-progs: print-tree: add validation to print_chunk Lu Fengqi
2017-04-20 11:52 ` [PATCH v2 1/2] btrfs-progs: dump-super: check array_size in print_sys_chunk_array David Sterba
0 siblings, 2 replies; 3+ messages in thread
From: Lu Fengqi @ 2017-04-20 8:07 UTC (permalink / raw)
To: linux-btrfs; +Cc: dsterba
Without validation of array_size, the dump-super may lead to a bad
memory access.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
v2:
Accept David's advice, no longer use BTRFS_SUPER_INFO_SIZE instead of sizeof(*sb).
---
cmds-inspect-dump-super.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index ee2c8e3a..b65bd2d9 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -65,13 +65,20 @@ static void print_sys_chunk_array(struct btrfs_super_block *sb)
buf = malloc(sizeof(*buf) + sizeof(*sb));
if (!buf) {
error("not enough memory");
- goto out;
+ return;
}
write_extent_buffer(buf, sb, 0, sizeof(*sb));
array_size = btrfs_super_sys_array_size(sb);
array_ptr = sb->sys_chunk_array;
sb_array_offset = offsetof(struct btrfs_super_block, sys_chunk_array);
+
+ if (array_size > BTRFS_SYSTEM_CHUNK_ARRAY_SIZE) {
+ error("sys_array_size %u shouldn't exceed %u bytes",
+ array_size, BTRFS_SYSTEM_CHUNK_ARRAY_SIZE);
+ goto out;
+ }
+
cur_offset = 0;
item = 0;
@@ -124,8 +131,8 @@ static void print_sys_chunk_array(struct btrfs_super_block *sb)
item++;
}
- free(buf);
out:
+ free(buf);
return;
out_short_read:
--
2.12.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2 2/2] btrfs-progs: print-tree: add validation to print_chunk
2017-04-20 8:07 [PATCH v2 1/2] btrfs-progs: dump-super: check array_size in print_sys_chunk_array Lu Fengqi
@ 2017-04-20 8:07 ` Lu Fengqi
2017-04-20 11:52 ` [PATCH v2 1/2] btrfs-progs: dump-super: check array_size in print_sys_chunk_array David Sterba
1 sibling, 0 replies; 3+ messages in thread
From: Lu Fengqi @ 2017-04-20 8:07 UTC (permalink / raw)
To: linux-btrfs; +Cc: dsterba
In print_chunk, validate the value of uuid_offset when read the dev_uuid of
stripe.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
cmds-inspect-dump-super.c | 1 +
print-tree.c | 20 +++++++++++++++++++-
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index b65bd2d9..85307e33 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -68,6 +68,7 @@ static void print_sys_chunk_array(struct btrfs_super_block *sb)
return;
}
write_extent_buffer(buf, sb, 0, sizeof(*sb));
+ buf->len = sizeof(*sb);
array_size = btrfs_super_sys_array_size(sb);
array_ptr = sb->sys_chunk_array;
diff --git a/print-tree.c b/print-tree.c
index 5af80e87..8352e03d 100644
--- a/print-tree.c
+++ b/print-tree.c
@@ -199,8 +199,14 @@ void print_chunk(struct extent_buffer *eb, struct btrfs_chunk *chunk)
{
int num_stripes = btrfs_chunk_num_stripes(eb, chunk);
int i;
+ u32 chunk_item_size = btrfs_chunk_item_size(num_stripes);
char chunk_flags_str[32] = {0};
+ if ((unsigned long)chunk + chunk_item_size > eb->len) {
+ printf("\t\tchunk item invalid\n");
+ return;
+ }
+
bg_flags_to_str(btrfs_chunk_type(eb, chunk), chunk_flags_str);
printf("\t\tlength %llu owner %llu stripe_len %llu type %s\n",
(unsigned long long)btrfs_chunk_length(eb, chunk),
@@ -216,9 +222,21 @@ void print_chunk(struct extent_buffer *eb, struct btrfs_chunk *chunk)
for (i = 0 ; i < num_stripes ; i++) {
unsigned char dev_uuid[BTRFS_UUID_SIZE];
char str_dev_uuid[BTRFS_UUID_UNPARSED_SIZE];
+ u64 uuid_offset;
+ u64 stripe_offset;
+
+ uuid_offset = (unsigned long)btrfs_stripe_dev_uuid_nr(chunk, i);
+ stripe_offset = (unsigned long)btrfs_stripe_nr(chunk, i);
+
+ if (uuid_offset < stripe_offset ||
+ (uuid_offset + BTRFS_UUID_SIZE) >
+ (stripe_offset + sizeof(struct btrfs_stripe))) {
+ printf("\t\t\tstripe %d invalid\n", i);
+ break;
+ }
read_extent_buffer(eb, dev_uuid,
- (unsigned long)btrfs_stripe_dev_uuid_nr(chunk, i),
+ uuid_offset,
BTRFS_UUID_SIZE);
uuid_unparse(dev_uuid, str_dev_uuid);
printf("\t\t\tstripe %d devid %llu offset %llu\n", i,
--
2.12.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2 1/2] btrfs-progs: dump-super: check array_size in print_sys_chunk_array
2017-04-20 8:07 [PATCH v2 1/2] btrfs-progs: dump-super: check array_size in print_sys_chunk_array Lu Fengqi
2017-04-20 8:07 ` [PATCH v2 2/2] btrfs-progs: print-tree: add validation to print_chunk Lu Fengqi
@ 2017-04-20 11:52 ` David Sterba
1 sibling, 0 replies; 3+ messages in thread
From: David Sterba @ 2017-04-20 11:52 UTC (permalink / raw)
To: Lu Fengqi; +Cc: linux-btrfs, dsterba
On Thu, Apr 20, 2017 at 04:07:56PM +0800, Lu Fengqi wrote:
> Without validation of array_size, the dump-super may lead to a bad
> memory access.
>
> Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
1-2 applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-04-20 11:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-20 8:07 [PATCH v2 1/2] btrfs-progs: dump-super: check array_size in print_sys_chunk_array Lu Fengqi
2017-04-20 8:07 ` [PATCH v2 2/2] btrfs-progs: print-tree: add validation to print_chunk Lu Fengqi
2017-04-20 11:52 ` [PATCH v2 1/2] btrfs-progs: dump-super: check array_size in print_sys_chunk_array David Sterba
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.