Message ID | 20181105213145.7560-5-stefanrin@gmail.com (mailing list archive) |
---|---|
State | Superseded, archived |
Headers | show |
Series | Try to squash metadump data leaks | expand |
On Mon, Nov 05, 2018 at 10:31:44PM +0100, Stefan Ring wrote: > Signed-off-by: Stefan Ring <stefanrin@gmail.com> Looks ok, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > --- > db/metadump.c | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > diff --git a/db/metadump.c b/db/metadump.c > index d4c751c0..59765263 100644 > --- a/db/metadump.c > +++ b/db/metadump.c > @@ -2173,6 +2173,19 @@ process_btinode( > } > > pp = XFS_BMDR_PTR_ADDR(dib, 1, maxrecs); > + > + if (zero_stale_data) { > + char *top; > + > + /* Unused btree key space */ > + top = (char*)XFS_BMDR_KEY_ADDR(dib, nrecs + 1); > + memset(top, 0, (char*)pp - top); > + > + /* Unused btree ptr space */ > + top = (char*)&pp[nrecs]; > + memset(top, 0, (char*)dib + XFS_DFORK_SIZE(dip, mp, whichfork) - top); > + } > + > for (i = 0; i < nrecs; i++) { > xfs_agnumber_t ag; > xfs_agblock_t bno; > -- > 2.14.5 >
diff --git a/db/metadump.c b/db/metadump.c index d4c751c0..59765263 100644 --- a/db/metadump.c +++ b/db/metadump.c @@ -2173,6 +2173,19 @@ process_btinode( } pp = XFS_BMDR_PTR_ADDR(dib, 1, maxrecs); + + if (zero_stale_data) { + char *top; + + /* Unused btree key space */ + top = (char*)XFS_BMDR_KEY_ADDR(dib, nrecs + 1); + memset(top, 0, (char*)pp - top); + + /* Unused btree ptr space */ + top = (char*)&pp[nrecs]; + memset(top, 0, (char*)dib + XFS_DFORK_SIZE(dip, mp, whichfork) - top); + } + for (i = 0; i < nrecs; i++) { xfs_agnumber_t ag; xfs_agblock_t bno;
Signed-off-by: Stefan Ring <stefanrin@gmail.com> --- db/metadump.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)