From: Eric Sandeen Date: Fri, 4 Aug 2017 21:33:51 +0000 (-0500) Subject: xfs_metadump: properly handle obfuscation of all remote attribute blocks X-Git-Tag: v4.13.0-rc1~35 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e66eae017775ddc7bcb65cac6a4b24434b5f651f;p=thirdparty%2Fxfsprogs-dev.git xfs_metadump: properly handle obfuscation of all remote attribute blocks add_remote_vals assumes that it can subtract blocksize from each block that it processes, but with CRCs, there is a header on each block, so the assumption that each block consumes $BLOCKSIZE of the value length is incorrect. This causes us to stop adding remote blocks too soon, and the missed blocks do not get obfuscated. Fix this by accounting for the header size as appropriate, depending on whether or not we have a CRC filesystem. Signed-off-by: Eric Sandeen Reviewed-by: Brian Foster Signed-off-by: Eric Sandeen --- diff --git a/db/metadump.c b/db/metadump.c index 96641e05a..31bb5959a 100644 --- a/db/metadump.c +++ b/db/metadump.c @@ -1609,7 +1609,7 @@ add_remote_vals( attr_data.remote_vals[attr_data.remote_val_count] = blockidx; attr_data.remote_val_count++; blockidx++; - length -= mp->m_sb.sb_blocksize; + length -= XFS_ATTR3_RMT_BUF_SPACE(mp, mp->m_sb.sb_blocksize); } if (attr_data.remote_val_count >= MAX_REMOTE_VALS) {