From 192fea3ce29b470c475b8340944a89debeb7c8ed Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Sun, 17 Nov 2019 09:21:40 +0100 Subject: [PATCH] mds: audit memset & bzero users for FIPS. Signed-off-by: Radoslaw Zarzynski (cherry picked from commit 81fd0a4a8720895ca224c2363478bdfaa358f3a6) --- src/mds/MDCache.cc | 1 + src/mds/Server.cc | 1 + src/mds/mdstypes.h | 7 ++++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index e9238391cccfc..fbcda54cc5c77 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -383,6 +383,7 @@ void MDCache::create_unlinked_system_inode(CInode *in, inodeno_t ino, in->inode.change_attr = 0; in->inode.export_pin = MDS_RANK_NONE; + // FIPS zeroization audit 20191117: this memset is not security related. memset(&in->inode.dir_layout, 0, sizeof(in->inode.dir_layout)); if (in->inode.is_dir()) { in->inode.dir_layout.dl_dir_hash = g_conf()->mds_default_dir_hash; diff --git a/src/mds/Server.cc b/src/mds/Server.cc index c8ab1eda9ad8b..591a692d42899 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -3133,6 +3133,7 @@ CInode* Server::prepare_new_inode(MDRequestRef& mdr, CDir *dir, inodeno_t useino in->inode.mode = mode; + // FIPS zeroization audit 20191117: this memset is not security related. memset(&in->inode.dir_layout, 0, sizeof(in->inode.dir_layout)); if (in->inode.is_dir()) { in->inode.dir_layout.dl_dir_hash = g_conf()->mds_default_dir_hash; diff --git a/src/mds/mdstypes.h b/src/mds/mdstypes.h index dec19c1ec9fc1..791d65e4d0013 100644 --- a/src/mds/mdstypes.h +++ b/src/mds/mdstypes.h @@ -534,6 +534,7 @@ struct inode_t { inode_t() { clear_layout(); + // FIPS zeroization audit 20191117: this memset is not security related. memset(&dir_layout, 0, sizeof(dir_layout)); } @@ -712,8 +713,10 @@ void inode_t::decode(bufferlist::const_iterator &p) if (struct_v >= 4) decode(dir_layout, p); - else + else { + // FIPS zeroization audit 20191117: this memset is not security related. memset(&dir_layout, 0, sizeof(dir_layout)); + } decode(layout, p); decode(size, p); decode(truncate_seq, p); @@ -1366,6 +1369,7 @@ struct cap_reconnect_t { bufferlist flockbl; cap_reconnect_t() { + // FIPS zeroization audit 20191117: this memset is not security related. memset(&capinfo, 0, sizeof(capinfo)); snap_follows = 0; } @@ -1395,6 +1399,7 @@ struct snaprealm_reconnect_t { mutable ceph_mds_snaprealm_reconnect realm; snaprealm_reconnect_t() { + // FIPS zeroization audit 20191117: this memset is not security related. memset(&realm, 0, sizeof(realm)); } snaprealm_reconnect_t(inodeno_t ino, snapid_t seq, inodeno_t parent) { -- 2.39.5