From: Stefan Ring <stefanrin@gmail.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 5/5] xfs_metadump: Zap dev inodes
Date: Fri, 26 Oct 2018 22:19:43 +0200 [thread overview]
Message-ID: <20181026201943.24131-6-stefanrin@gmail.com> (raw)
In-Reply-To: <20181026201943.24131-1-stefanrin@gmail.com>
---
db/metadump.c | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/db/metadump.c b/db/metadump.c
index 39183fb7..bdc6f2f4 100644
--- a/db/metadump.c
+++ b/db/metadump.c
@@ -2269,6 +2269,24 @@ process_inode_data(
return 1;
}
+static int
+process_dev_inode(
+ xfs_dinode_t *dip)
+{
+ if (XFS_DFORK_NEXTENTS(dip, XFS_ATTR_FORK) ||
+ XFS_DFORK_NEXTENTS(dip, XFS_DATA_FORK)) {
+ if (show_warnings)
+ print_warning("inode %llu has unexpected extents",
+ (unsigned long long)cur_ino);
+ return 0;
+ } else {
+ int used = XFS_DFORK_DPTR(dip) - (char*)dip;
+
+ memset(XFS_DFORK_DPTR(dip), 0, mp->m_sb.sb_inodesize - used);
+ return 1;
+ }
+}
+
/*
* when we process the inode, we may change the data in the data and/or
* attribute fork if they are in short form and we are obfuscating names.
@@ -2321,7 +2339,9 @@ process_inode(
case S_IFREG:
success = process_inode_data(dip, TYP_DATA);
break;
- default: ;
+ default:
+ success = process_dev_inode(dip);
+ break;
}
nametable_clear();
--
2.14.5
next prev parent reply other threads:[~2018-10-27 4:58 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-26 20:19 [PATCH 0/5] v4 Try to squash metadump data leaks Stefan Ring
2018-10-26 20:19 ` [PATCH 1/5] xfs_metadump: Extend data zapping to XFS_DIR{2,3}_LEAFN_MAGIC blocks Stefan Ring
2018-10-26 20:19 ` [PATCH 2/5] xfs_metadump: Zap multi fsb blocks Stefan Ring
2018-10-26 20:19 ` [PATCH 3/5] xfs_metadump: Zap freeindex blocks in directory inodes Stefan Ring
2018-10-26 20:19 ` [PATCH 4/5] xfs_metadump: Zap unused space in inode btrees Stefan Ring
2018-10-27 6:23 ` Stefan Ring
2018-10-26 20:19 ` Stefan Ring [this message]
2018-10-29 15:38 ` [PATCH 5/5] xfs_metadump: Zap dev inodes Eric Sandeen
2018-10-29 18:33 ` Stefan Ring
2018-10-29 18:37 ` Eric Sandeen
2018-10-29 18:45 ` Stefan Ring
2018-10-26 20:27 ` [PATCH 0/5] v4 Try to squash metadump data leaks Eric Sandeen
2018-10-26 23:33 ` Eric Sandeen
2018-10-26 23:38 ` Darrick J. Wong
2018-10-28 12:38 ` Stefan Ring
2018-10-28 14:36 ` Stefan Ring
2018-10-28 15:42 ` Stefan Ring
2018-10-28 17:13 ` Eric Sandeen
2018-10-30 12:29 ` Stefan Ring
2018-10-30 12:36 ` Eric Sandeen
-- strict thread matches above, loose matches on Subject: below --
2018-11-05 21:31 [PATCH v5 0/5] " Stefan Ring
2018-11-05 21:31 ` [PATCH 5/5] xfs_metadump: Zap dev inodes Stefan Ring
2019-01-03 17:57 ` Darrick J. Wong
2019-01-07 20:13 [PATCH v6 0/5] Try to squash metadump data leaks Stefan Ring
2019-01-07 20:13 ` [PATCH 5/5] xfs_metadump: Zap dev inodes Stefan Ring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181026201943.24131-6-stefanrin@gmail.com \
--to=stefanrin@gmail.com \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.