From 4d3e939034f5fdf7d1a9c52646d0f6804e9e031f Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Sat, 16 Nov 2019 00:47:24 +0100 Subject: [PATCH] librados: audit memset & bzero users for FIPS. Signed-off-by: Radoslaw Zarzynski (cherry picked from commit 00fb1e1c7f1ac523258a334995b72b48c1f4c1ed) --- src/librados/librados_c.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/librados/librados_c.cc b/src/librados/librados_c.cc index 118ca2fd5b73a..f8b976d257655 100644 --- a/src/librados/librados_c.cc +++ b/src/librados/librados_c.cc @@ -601,8 +601,10 @@ extern "C" int _rados_pool_list(rados_t cluster, char *buf, size_t len) } char *b = buf; - if (b) + if (b) { + // FIPS zeroization audit 20191116: this memset is not security related. memset(b, 0, len); + } int needed = 0; std::list >::const_iterator i = pools.begin(); std::list >::const_iterator p_end = @@ -647,8 +649,10 @@ extern "C" int _rados_inconsistent_pg_list(rados_t cluster, int64_t pool_id, } char *b = buf; - if (b) + if (b) { + // FIPS zeroization audit 20191116: this memset is not security related. memset(b, 0, len); + } int needed = 0; for (const auto& s : pgs) { unsigned rl = s.length() + 1; @@ -1952,6 +1956,7 @@ extern "C" int _rados_object_list(rados_ioctx_t io, librados::IoCtxImpl *ctx = (librados::IoCtxImpl *)io; // Zero out items so that they will be safe to free later + // FIPS zeroization audit 20191116: this memset is not security related. memset(result_items, 0, sizeof(rados_object_list_item) * result_item_count); std::list result; -- 2.39.5