From 4fd393f3ce714ce325aed83a40ce29204e91e1fe Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Wed, 1 Aug 2012 15:42:15 -0700 Subject: [PATCH] librbd: fix bounds of memcpy in info() Caught by valgrind. Signed-off-by: Josh Durgin --- src/librbd/internal.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc index 987e916060fbd..f4cec359fef71 100644 --- a/src/librbd/internal.cc +++ b/src/librbd/internal.cc @@ -108,7 +108,7 @@ namespace librbd { info.num_objs = howmany(info.size, get_block_size(obj_order)); info.order = obj_order; memcpy(&info.block_name_prefix, ictx->object_prefix.c_str(), - RBD_MAX_BLOCK_NAME_SIZE); + min((size_t)RBD_MAX_BLOCK_NAME_SIZE, ictx->object_prefix.length())); // clear deprecated fields info.parent_pool = -1L; info.parent_name[0] = '\0'; -- 2.39.5