From: Mykola Golub <mgolub@mirantis.com>
Date: Wed, 22 Mar 2017 20:03:34 +0000 (+0100)
Subject: librbd: potential use of uninitialised value in ImageWatcher
X-Git-Tag: v12.0.2~308^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F14091%2Fhead;p=ceph.git

librbd: potential use of uninitialised value in ImageWatcher

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
---

diff --git a/src/librbd/ImageWatcher.cc b/src/librbd/ImageWatcher.cc
index 8219201d1d56..18b55a0c070e 100644
--- a/src/librbd/ImageWatcher.cc
+++ b/src/librbd/ImageWatcher.cc
@@ -651,7 +651,7 @@ bool ImageWatcher<I>::handle_payload(const FlattenPayload &payload,
       ProgressContext *prog_ctx;
       r = prepare_async_request(payload.async_request_id, &new_request,
                                 &ctx, &prog_ctx);
-      if (new_request) {
+      if (r == 0 && new_request) {
         ldout(m_image_ctx.cct, 10) << this << " remote flatten request: "
 				   << payload.async_request_id << dendl;
         m_image_ctx.operations->execute_flatten(*prog_ctx, ctx);
@@ -677,7 +677,7 @@ bool ImageWatcher<I>::handle_payload(const ResizePayload &payload,
       ProgressContext *prog_ctx;
       r = prepare_async_request(payload.async_request_id, &new_request,
                                 &ctx, &prog_ctx);
-      if (new_request) {
+      if (r == 0 && new_request) {
         ldout(m_image_ctx.cct, 10) << this << " remote resize request: "
 				   << payload.async_request_id << " "
 				   << payload.size << " "
@@ -812,7 +812,7 @@ bool ImageWatcher<I>::handle_payload(const RebuildObjectMapPayload& payload,
       ProgressContext *prog_ctx;
       r = prepare_async_request(payload.async_request_id, &new_request,
                                 &ctx, &prog_ctx);
-      if (new_request) {
+      if (r == 0 && new_request) {
         ldout(m_image_ctx.cct, 10) << this
                                    << " remote rebuild object map request: "
                                    << payload.async_request_id << dendl;