]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #31692 from rzarzynski/wip-fips-zeroize-memset_bzero
authorKefu Chai <kchai@redhat.com>
Sun, 24 Nov 2019 17:05:16 +0000 (01:05 +0800)
committerGitHub <noreply@github.com>
Sun, 24 Nov 2019 17:05:16 +0000 (01:05 +0800)
FIPS: audit and switch some memset & bzero users

Reviewed-by: Marcus Watts <mwatts@redhat.com>
1  2 
src/common/admin_socket_client.cc
src/common/ceph_context.cc
src/librados/librados_c.cc
src/librbd/internal.cc
src/librbd/librbd.cc
src/mds/MDCache.cc
src/msg/async/rdma/Infiniband.cc
src/rgw/rgw_file.h
src/rgw/rgw_kms.cc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index cb49193bb2ee70ff527505d0b281496531a4d0c7,ce40d1627a8eda671059421477b86fe524184901..5a86b25fefcc6f492305c817fb67246463f984e0
@@@ -182,10 -169,10 +182,10 @@@ static int request_key_from_vault_with_
      --res;
    }
    vault_token = std::string{buf, static_cast<size_t>(res)};
-   memset(buf, 0, sizeof(buf));
+   ::ceph::crypto::zeroize_for_security(buf, sizeof(buf));
  
 -  vault_addr = cct->_conf->rgw_crypt_vault_addr;
 -  if (vault_addr.empty()) {
 +  secret_url = cct->_conf->rgw_crypt_vault_addr;
 +  if (secret_url.empty()) {
      ldout(cct, 0) << "ERROR: Vault address not set in rgw_crypt_vault_addr" << dendl;
      return -EINVAL;
    }