|
 |
9c4b3e |
commit 595629131dbe6c5fb16d03e87bc2cb71ad3dcc4b
|
|
|
9c4b3e |
Author: Eric Sandeen <sandeen@redhat.com>
|
|
|
9c4b3e |
Date: Wed Feb 15 21:48:31 2017 -0600
|
|
|
9c4b3e |
|
|
|
9c4b3e |
xfs_metadump: ignore attr leaf with 0 entries
|
|
|
9c4b3e |
|
|
|
9c4b3e |
Another in the ongoing saga of attribute leaves with zero
|
|
|
9c4b3e |
entries; in this case, if we try to metadump an inode with
|
|
|
9c4b3e |
a zero-entries attribute leaf, the zeroing code will go off
|
|
|
9c4b3e |
the rails and segfault at:
|
|
|
9c4b3e |
|
|
|
9c4b3e |
memset(&entries[nentries], 0,
|
|
|
9c4b3e |
first_name - (char *)&entries[nentries]);
|
|
|
9c4b3e |
|
|
|
9c4b3e |
because first_name is null, and we try to memset a large
|
|
|
9c4b3e |
(negative) number.
|
|
|
9c4b3e |
|
|
|
9c4b3e |
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
|
|
|
9c4b3e |
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
|
|
|
9c4b3e |
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
|
|
|
9c4b3e |
|
|
|
9c4b3e |
diff --git a/db/metadump.c b/db/metadump.c
|
|
|
9c4b3e |
index 38519f1..66952f6 100644
|
|
|
9c4b3e |
--- a/db/metadump.c
|
|
|
9c4b3e |
+++ b/db/metadump.c
|
|
|
9c4b3e |
@@ -1654,7 +1654,8 @@ process_attr_block(
|
|
|
9c4b3e |
xfs_attr3_leaf_hdr_from_disk(mp->m_attr_geo, &hdr, leaf);
|
|
|
9c4b3e |
|
|
|
9c4b3e |
nentries = hdr.count;
|
|
|
9c4b3e |
- if (nentries * sizeof(xfs_attr_leaf_entry_t) +
|
|
|
9c4b3e |
+ if (nentries == 0 ||
|
|
|
9c4b3e |
+ nentries * sizeof(xfs_attr_leaf_entry_t) +
|
|
|
9c4b3e |
xfs_attr3_leaf_hdr_size(leaf) >
|
|
|
9c4b3e |
XFS_ATTR3_RMT_BUF_SPACE(mp, bs)) {
|
|
|
9c4b3e |
if (show_warnings)
|