From 73e6265e8afac96dbc690f0343a418ca301d4495 Mon Sep 17 00:00:00 2001 From: yangjun Date: Sun, 8 Dec 2019 09:09:53 +0800 Subject: [PATCH] librbd: fix rbd_open_by_id, rbd_open_by_id_read_only These methods incorrectly delete ImageCtx on error, resulting in double-free heap corruption. Fixes: https://tracker.ceph.com/issues/43178 Signed-off-by: yangjun (cherry picked from commit 3457192c24a66ba499a7c9b1747bc29c79b34636) --- src/librbd/librbd.cc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/librbd/librbd.cc b/src/librbd/librbd.cc index 5249c545a3ad..749f5cb5eddd 100644 --- a/src/librbd/librbd.cc +++ b/src/librbd/librbd.cc @@ -3973,9 +3973,7 @@ extern "C" int rbd_open_by_id(rados_ioctx_t p, const char *id, ictx->id.c_str(), ictx->snap_name.c_str(), ictx->read_only); int r = ictx->state->open(0); - if (r < 0) { - delete ictx; - } else { + if (r >= 0) { *image = (rbd_image_t)ictx; } tracepoint(librbd, open_image_exit, r); @@ -4048,9 +4046,7 @@ extern "C" int rbd_open_by_id_read_only(rados_ioctx_t p, const char *id, ictx->id.c_str(), ictx->snap_name.c_str(), ictx->read_only); int r = ictx->state->open(0); - if (r < 0) { - delete ictx; - } else { + if (r >= 0) { *image = (rbd_image_t)ictx; } tracepoint(librbd, open_image_exit, r); -- 2.47.3