From 72c04a9d319520c29dfdf952408beb12ed73a88e Mon Sep 17 00:00:00 2001 From: YuanXin Date: Sat, 27 Feb 2021 11:37:19 +0800 Subject: [PATCH] rbd: use portable zero-ing memory function Signed-off-by: YuanXin --- src/librbd/crypto/luks/LoadRequest.cc | 2 +- src/tools/rbd_nbd/rbd-nbd.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/librbd/crypto/luks/LoadRequest.cc b/src/librbd/crypto/luks/LoadRequest.cc index 2b0dbe47d25..f23b7ec8b01 100644 --- a/src/librbd/crypto/luks/LoadRequest.cc +++ b/src/librbd/crypto/luks/LoadRequest.cc @@ -212,7 +212,7 @@ void LoadRequest::read_volume_key() { template void LoadRequest::finish(int r) { - explicit_bzero(&m_passphrase[0], m_passphrase.size()); + ceph_memzero_s(&m_passphrase[0], m_passphrase.size(), m_passphrase.size()); m_on_finish->complete(r); delete this; } diff --git a/src/tools/rbd_nbd/rbd-nbd.cc b/src/tools/rbd_nbd/rbd-nbd.cc index 3a13ff82fb1..04480883008 100644 --- a/src/tools/rbd_nbd/rbd-nbd.cc +++ b/src/tools/rbd_nbd/rbd-nbd.cc @@ -1660,7 +1660,7 @@ static int do_map(int argc, const char *argv[], Config *cfg, bool reconnect) std::string passphrase((std::istreambuf_iterator(file)), (std::istreambuf_iterator())); auto sg = make_scope_guard([&] { - explicit_bzero(&passphrase[0], passphrase.size()); }); + ceph_memzero_s(&passphrase[0], passphrase.size(), passphrase.size()); }); file.close(); if (!passphrase.empty() && passphrase[passphrase.length() - 1] == '\n') { passphrase.erase(passphrase.length() - 1);